diff --git a/src/components/Icons/index.ts b/src/components/Icons/index.ts deleted file mode 100644 index 42e66b69..00000000 --- a/src/components/Icons/index.ts +++ /dev/null @@ -1,70 +0,0 @@ -// @index(['./*.svg'], f => `export { default as ${f.name} } from 'components/Icons/${f.name}.svg'`) -export { default as Account } from 'components/Icons/Account.svg' -export { default as AccountArrowDown } from 'components/Icons/AccountArrowDown.svg' -export { default as ArrowChartLineUp } from 'components/Icons/ArrowChartLineUp.svg' -export { default as ArrowCircle } from 'components/Icons/ArrowCircle.svg' -export { default as ArrowCircledTopRight } from 'components/Icons/ArrowCircledTopRight.svg' -export { default as ArrowDownLine } from 'components/Icons/ArrowDownLine.svg' -export { default as ArrowRight } from 'components/Icons/ArrowRight.svg' -export { default as ArrowUpLine } from 'components/Icons/ArrowUpLine.svg' -export { default as Chain } from 'components/Icons/Chain.svg' -export { default as Check } from 'components/Icons/Check.svg' -export { default as CheckCircled } from 'components/Icons/CheckCircled.svg' -export { default as ChevronDown } from 'components/Icons/ChevronDown.svg' -export { default as ChevronLeft } from 'components/Icons/ChevronLeft.svg' -export { default as ChevronRight } from 'components/Icons/ChevronRight.svg' -export { default as ChevronUp } from 'components/Icons/ChevronUp.svg' -export { default as Circle } from 'components/Icons/Circle.svg' -export { default as Coins } from 'components/Icons/Coins.svg' -export { default as CoinsSwap } from 'components/Icons/CoinsSwap.svg' -export { default as Compass } from 'components/Icons/Compass.svg' -export { default as Copy } from 'components/Icons/Copy.svg' -export { default as Cross } from 'components/Icons/Cross.svg' -export { default as CrossCircled } from 'components/Icons/CrossCircled.svg' -export { default as Edit } from 'components/Icons/Edit.svg' -export { default as Enter } from 'components/Icons/Enter.svg' -export { default as ExclamationMarkCircled } from 'components/Icons/ExclamationMarkCircled.svg' -export { default as ExclamationMarkTriangle } from 'components/Icons/ExclamationMarkTriangle.svg' -export { default as ExternalLink } from 'components/Icons/ExternalLink.svg' -export { default as Flag } from 'components/Icons/Flag.svg' -export { default as Gear } from 'components/Icons/Gear.svg' -export { default as GridGlobe } from 'components/Icons/GridGlobe.svg' -export { default as GridHole } from 'components/Icons/GridHole.svg' -export { default as GridLandscape } from 'components/Icons/GridLandscape.svg' -export { default as GridPlanet } from 'components/Icons/GridPlanet.svg' -export { default as GridTire } from 'components/Icons/GridTire.svg' -export { default as GridWeb } from 'components/Icons/GridWeb.svg' -export { default as HandCoins } from 'components/Icons/HandCoins.svg' -export { default as Heart } from 'components/Icons/Heart.svg' -export { default as InfoCircle } from 'components/Icons/InfoCircle.svg' -export { default as LockLocked } from 'components/Icons/LockLocked.svg' -export { default as LockUnlocked } from 'components/Icons/LockUnlocked.svg' -export { default as Logo } from 'components/Icons/Logo.svg' -export { default as Luggage } from 'components/Icons/Luggage.svg' -export { default as MarsProtocol } from 'components/Icons/MarsProtocol.svg' -export { default as Neutron } from 'components/Icons/Neutron.svg' -export { default as Osmo } from 'components/Icons/Osmo.svg' -export { default as OverlayMark } from 'components/Icons/OverlayMark.svg' -export { default as Plus } from 'components/Icons/Plus.svg' -export { default as PlusCircled } from 'components/Icons/PlusCircled.svg' -export { default as PlusSquared } from 'components/Icons/PlusSquared.svg' -export { default as PythLogoType } from 'components/Icons/PythLogoType.svg' -export { default as Questionmark } from 'components/Icons/Questionmark.svg' -export { default as ReceiptCheck } from 'components/Icons/ReceiptCheck.svg' -export { default as Scale } from 'components/Icons/Scale.svg' -export { default as Search } from 'components/Icons/Search.svg' -export { default as Shield } from 'components/Icons/Shield.svg' -export { default as SortAsc } from 'components/Icons/SortAsc.svg' -export { default as SortDesc } from 'components/Icons/SortDesc.svg' -export { default as SortNone } from 'components/Icons/SortNone.svg' -export { default as StarFilled } from 'components/Icons/StarFilled.svg' -export { default as StarOutlined } from 'components/Icons/StarOutlined.svg' -export { default as Subtract } from 'components/Icons/Subtract.svg' -export { default as SwapIcon } from 'components/Icons/SwapIcon.svg' -export { default as ThreeDots } from 'components/Icons/ThreeDots.svg' -export { default as TooltipArrow } from 'components/Icons/TooltipArrow.svg' -export { default as TrashBin } from 'components/Icons/TrashBin.svg' -export { default as Twitter } from 'components/Icons/Twitter.svg' -export { default as VerticalThreeLine } from 'components/Icons/VerticalThreeLine.svg' -export { default as Wallet } from 'components/Icons/Wallet.svg' -// @endindex diff --git a/src/components/Modals/Account/AccountDeleteAlertDialog.tsx b/src/components/Modals/Account/AccountDeleteAlertDialog.tsx index e340fc12..865d0c31 100644 --- a/src/components/Modals/Account/AccountDeleteAlertDialog.tsx +++ b/src/components/Modals/Account/AccountDeleteAlertDialog.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react' -import { Enter, InfoCircle } from 'components/Icons' +import { Enter, InfoCircle } from 'components/common/Icons' import useAlertDialog from 'hooks/useAlertDialog' interface Props { diff --git a/src/components/Modals/Account/AccountDeleteModal.tsx b/src/components/Modals/Account/AccountDeleteModal.tsx index e7484e77..ba001cdd 100644 --- a/src/components/Modals/Account/AccountDeleteModal.tsx +++ b/src/components/Modals/Account/AccountDeleteModal.tsx @@ -1,10 +1,10 @@ import { useCallback, useMemo } from 'react' import { useLocation, useNavigate, useParams, useSearchParams } from 'react-router-dom' -import AssetBalanceRow from 'components/Asset/AssetBalanceRow' -import { ArrowRight, ExclamationMarkCircled } from 'components/Icons' +import AssetBalanceRow from 'components/common/assets/AssetBalanceRow' +import { ArrowRight, ExclamationMarkCircled } from 'components/common/Icons' import AccountDeleteAlertDialog from 'components/Modals/Account/AccountDeleteAlertDialog' -import Text from 'components/Text' +import Text from 'components/common/Text' import useAllAssets from 'hooks/assets/useAllAssets' import useStore from 'store' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Modals/AddVaultAssets/AddVaultBorrowAssetsModalContent.tsx b/src/components/Modals/AddVaultAssets/AddVaultBorrowAssetsModalContent.tsx index 10ae8dac..a40e4cef 100644 --- a/src/components/Modals/AddVaultAssets/AddVaultBorrowAssetsModalContent.tsx +++ b/src/components/Modals/AddVaultAssets/AddVaultBorrowAssetsModalContent.tsx @@ -1,8 +1,8 @@ import { useCallback, useMemo, useState } from 'react' import AssetSelectTable from 'components/Modals/AssetsSelect/AssetSelectTable' -import SearchBar from 'components/SearchBar' -import Text from 'components/Text' +import SearchBar from 'components/common/SearchBar' +import Text from 'components/common/Text' import useMarketBorrowings from 'hooks/markets/useMarketBorrowings' import useStore from 'store' diff --git a/src/components/Modals/AddVaultAssets/index.tsx b/src/components/Modals/AddVaultAssets/index.tsx index fb4e7e5f..f3d0c7a1 100644 --- a/src/components/Modals/AddVaultAssets/index.tsx +++ b/src/components/Modals/AddVaultAssets/index.tsx @@ -1,10 +1,10 @@ import { useCallback, useState } from 'react' -import Button from 'components/Button' -import { CircularProgress } from 'components/CircularProgress' -import Modal from 'components/Modal' +import Button from 'components/common/Button' +import { CircularProgress } from 'components/common/CircularProgress' +import Modal from 'components/Modals/Modal' import AddVaultAssetsModalContent from 'components/Modals/AddVaultAssets/AddVaultBorrowAssetsModalContent' -import Text from 'components/Text' +import Text from 'components/common/Text' import useStore from 'store' export default function AddVaultBorrowAssetsModal() { diff --git a/src/components/Modals/AlertDialog/ButtonIcons.tsx b/src/components/Modals/AlertDialog/ButtonIcons.tsx index f4e028f7..9ad2debc 100644 --- a/src/components/Modals/AlertDialog/ButtonIcons.tsx +++ b/src/components/Modals/AlertDialog/ButtonIcons.tsx @@ -1,4 +1,4 @@ -import { Enter } from 'components/Icons' +import { Enter } from 'components/common/Icons' export function NoIcon() { return ( diff --git a/src/components/Modals/AlertDialog/index.tsx b/src/components/Modals/AlertDialog/index.tsx index 68512648..c61438f8 100644 --- a/src/components/Modals/AlertDialog/index.tsx +++ b/src/components/Modals/AlertDialog/index.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' -import Button from 'components/Button' -import Checkbox from 'components/Checkbox' -import Modal from 'components/Modal' +import Button from 'components/common/Button' +import Checkbox from 'components/common/Checkbox' +import Modal from 'components/Modals/Modal' import { NoIcon, YesIcon } from 'components/Modals/AlertDialog/ButtonIcons' -import Text from 'components/Text' +import Text from 'components/common/Text' import useAlertDialog from 'hooks/useAlertDialog' import useToggle from 'hooks/useToggle' diff --git a/src/components/Modals/AssetAmountSelectActionModal.tsx b/src/components/Modals/AssetAmountSelectActionModal.tsx index c937223b..7792fc7d 100644 --- a/src/components/Modals/AssetAmountSelectActionModal.tsx +++ b/src/components/Modals/AssetAmountSelectActionModal.tsx @@ -1,14 +1,14 @@ import { useCallback, useState } from 'react' -import CurrentAccountSummary from 'components/Account/CurrentAccountSummary' -import AssetImage from 'components/Asset/AssetImage' -import Button from 'components/Button' -import Card from 'components/Card' -import Divider from 'components/Divider' -import { ArrowRight } from 'components/Icons' -import Modal from 'components/Modal' -import Text from 'components/Text' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import CurrentAccountSummary from 'components/account/CurrentAccountSummary' +import AssetImage from 'components/common/assets/AssetImage' +import Button from 'components/common/Button' +import Card from 'components/common/Card' +import Divider from 'components/common/Divider' +import { ArrowRight } from 'components/common/Icons' +import Modal from 'components/Modals/Modal' +import Text from 'components/common/Text' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { BN_ZERO } from 'constants/math' import { byDenom } from 'utils/array' import { BN } from 'utils/helpers' diff --git a/src/components/Modals/AssetsSelect/AssetSelectTable.tsx b/src/components/Modals/AssetsSelect/AssetSelectTable.tsx index 03893875..a5835167 100644 --- a/src/components/Modals/AssetsSelect/AssetSelectTable.tsx +++ b/src/components/Modals/AssetsSelect/AssetSelectTable.tsx @@ -9,9 +9,9 @@ import { import classNames from 'classnames' import { useEffect, useMemo, useState } from 'react' -import { SortAsc, SortDesc, SortNone } from 'components/Icons' +import { SortAsc, SortDesc, SortNone } from 'components/common/Icons' import useAssetTableColumns from 'components/Modals/AssetsSelect/useAssetTableColumns' -import Text from 'components/Text' +import Text from 'components/common/Text' import useMarketAssets from 'hooks/markets/useMarketAssets' import useStore from 'store' import { byDenom } from 'utils/array' diff --git a/src/components/Modals/AssetsSelect/useAssetTableColumns.tsx b/src/components/Modals/AssetsSelect/useAssetTableColumns.tsx index 5b00667f..a42ece39 100644 --- a/src/components/Modals/AssetsSelect/useAssetTableColumns.tsx +++ b/src/components/Modals/AssetsSelect/useAssetTableColumns.tsx @@ -1,12 +1,12 @@ import { ColumnDef } from '@tanstack/react-table' import React from 'react' -import AssetImage from 'components/Asset/AssetImage' -import AssetRate from 'components/Asset/AssetRate' -import Checkbox from 'components/Checkbox' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' +import AssetImage from 'components/common/assets/AssetImage' +import AssetRate from 'components/common/assets/AssetRate' +import Checkbox from 'components/common/Checkbox' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' import { BNCoin } from 'types/classes/BNCoin' import { demagnify, formatPercent } from 'utils/formatters' diff --git a/src/components/Modals/BorrowModal.tsx b/src/components/Modals/BorrowModal.tsx index c1b982b6..fb950c4d 100644 --- a/src/components/Modals/BorrowModal.tsx +++ b/src/components/Modals/BorrowModal.tsx @@ -1,19 +1,19 @@ import BigNumber from 'bignumber.js' import { useCallback, useEffect, useMemo, useState } from 'react' -import AccountSummary from 'components/Account/AccountSummary' -import AssetImage from 'components/Asset/AssetImage' -import Button from 'components/Button' -import Card from 'components/Card' -import DisplayCurrency from 'components/DisplayCurrency' -import Divider from 'components/Divider' -import { FormattedNumber } from 'components/FormattedNumber' -import { ArrowRight, InfoCircle } from 'components/Icons' -import Modal from 'components/Modal' -import Switch from 'components/Switch' -import Text from 'components/Text' -import TitleAndSubCell from 'components/TitleAndSubCell' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import AccountSummary from 'components/account/AccountSummary' +import AssetImage from 'components/common/assets/AssetImage' +import Button from 'components/common/Button' +import Card from 'components/common/Card' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Divider from 'components/common/Divider' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { ArrowRight, InfoCircle } from 'components/common/Icons' +import Modal from 'components/Modals/Modal' +import Switch from 'components/common/Switch' +import Text from 'components/common/Text' +import TitleAndSubCell from 'components/common/TitleAndSubCell' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { BN_ZERO } from 'constants/math' import useMarketAssets from 'hooks/markets/useMarketAssets' import useAutoLend from 'hooks/useAutoLend' diff --git a/src/components/Modals/FundWithdraw/FundAccount.tsx b/src/components/Modals/FundWithdraw/FundAccount.tsx index 81b8da23..e5c5a2f4 100644 --- a/src/components/Modals/FundWithdraw/FundAccount.tsx +++ b/src/components/Modals/FundWithdraw/FundAccount.tsx @@ -1,4 +1,4 @@ -import AccountFundContent from 'components/Account/AccountFund/AccountFundContent' +import AccountFundContent from 'components/account/AccountFund/AccountFundContent' import useStore from 'store' interface Props { diff --git a/src/components/Modals/FundWithdraw/WithdrawFromAccount.tsx b/src/components/Modals/FundWithdraw/WithdrawFromAccount.tsx index 061cfb0d..9488088a 100644 --- a/src/components/Modals/FundWithdraw/WithdrawFromAccount.tsx +++ b/src/components/Modals/FundWithdraw/WithdrawFromAccount.tsx @@ -1,12 +1,12 @@ import BigNumber from 'bignumber.js' import { useEffect, useState } from 'react' -import Button from 'components/Button' -import Divider from 'components/Divider' -import { ArrowRight } from 'components/Icons' -import Switch from 'components/Switch' -import Text from 'components/Text' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import Button from 'components/common/Button' +import Divider from 'components/common/Divider' +import { ArrowRight } from 'components/common/Icons' +import Switch from 'components/common/Switch' +import Text from 'components/common/Text' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { BN_ZERO } from 'constants/math' import useAllAssets from 'hooks/assets/useAllAssets' import useMarketEnabledAssets from 'hooks/assets/useMarketEnabledAssets' diff --git a/src/components/Modals/FundWithdraw/index.tsx b/src/components/Modals/FundWithdraw/index.tsx index 92649fdb..2891c3df 100644 --- a/src/components/Modals/FundWithdraw/index.tsx +++ b/src/components/Modals/FundWithdraw/index.tsx @@ -1,6 +1,6 @@ import FundWithdrawModalContent from 'components/Modals/FundWithdraw/FundAndWithdrawModalContent' import ModalContentWithSummary from 'components/Modals/ModalContentWithSummary' -import Text from 'components/Text' +import Text from 'components/common/Text' import useAccount from 'hooks/accounts/useAccount' import useAccountId from 'hooks/useAccountId' import useStore from 'store' diff --git a/src/components/Modals/GetStartedModal.tsx b/src/components/Modals/GetStartedModal.tsx index 802adc32..2a403d64 100644 --- a/src/components/Modals/GetStartedModal.tsx +++ b/src/components/Modals/GetStartedModal.tsx @@ -1,8 +1,8 @@ import { useCallback } from 'react' -import { ChevronRight, Compass, HandCoins, Luggage } from 'components/Icons' -import Modal from 'components/Modal' -import Text from 'components/Text' +import { ChevronRight, Compass, HandCoins, Luggage } from 'components/common/Icons' +import Modal from 'components/Modals/Modal' +import Text from 'components/common/Text' import useStore from 'store' import { DocURL } from 'types/enums/docURL' diff --git a/src/components/Modals/HLS/Deposit/CreateAccount.tsx b/src/components/Modals/HLS/Deposit/CreateAccount.tsx index f761fc08..a73b6147 100644 --- a/src/components/Modals/HLS/Deposit/CreateAccount.tsx +++ b/src/components/Modals/HLS/Deposit/CreateAccount.tsx @@ -1,10 +1,10 @@ import React, { useState } from 'react' import { mutate } from 'swr' -import Button from 'components/Button' -import DocsLink from 'components/DocsLink' -import { ArrowRight } from 'components/Icons' -import Text from 'components/Text' +import Button from 'components/common/Button' +import DocsLink from 'components/common/DocsLink' +import { ArrowRight } from 'components/common/Icons' +import Text from 'components/common/Text' import useStore from 'store' export default function CreateAccount() { diff --git a/src/components/Modals/HLS/Deposit/Leverage.tsx b/src/components/Modals/HLS/Deposit/Leverage.tsx index e8e614e4..acb2da25 100644 --- a/src/components/Modals/HLS/Deposit/Leverage.tsx +++ b/src/components/Modals/HLS/Deposit/Leverage.tsx @@ -1,9 +1,9 @@ import React, { useMemo } from 'react' -import Button from 'components/Button' -import { ArrowRight } from 'components/Icons' +import Button from 'components/common/Button' +import { ArrowRight } from 'components/common/Icons' import LeverageSummary from 'components/Modals/HLS/Deposit/LeverageSummary' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { getLeveragedApy } from 'utils/math' interface Props { diff --git a/src/components/Modals/HLS/Deposit/LeverageSummary.tsx b/src/components/Modals/HLS/Deposit/LeverageSummary.tsx index 995f66ba..7139eac2 100644 --- a/src/components/Modals/HLS/Deposit/LeverageSummary.tsx +++ b/src/components/Modals/HLS/Deposit/LeverageSummary.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from 'react' -import SummaryItems from 'components/SummaryItems' +import SummaryItems from 'components/common/SummaryItems' import useBorrowAsset from 'hooks/useBorrowAsset' interface Props { diff --git a/src/components/Modals/HLS/Deposit/ProvideCollateral.tsx b/src/components/Modals/HLS/Deposit/ProvideCollateral.tsx index f1ed8b49..8bff06a0 100644 --- a/src/components/Modals/HLS/Deposit/ProvideCollateral.tsx +++ b/src/components/Modals/HLS/Deposit/ProvideCollateral.tsx @@ -1,8 +1,8 @@ import React from 'react' -import Button from 'components/Button' -import { ArrowRight } from 'components/Icons' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import Button from 'components/common/Button' +import { ArrowRight } from 'components/common/Icons' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' interface Props { amount: BigNumber diff --git a/src/components/Modals/HLS/Deposit/SelectAccount.tsx b/src/components/Modals/HLS/Deposit/SelectAccount.tsx index e0bf5362..e6a8330e 100644 --- a/src/components/Modals/HLS/Deposit/SelectAccount.tsx +++ b/src/components/Modals/HLS/Deposit/SelectAccount.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import React from 'react' -import Button from 'components/Button' -import { ArrowRight } from 'components/Icons' -import Radio from 'components/Radio' +import Button from 'components/common/Button' +import { ArrowRight } from 'components/common/Icons' +import Radio from 'components/common/Radio' interface Props { hlsAccounts: Account[] diff --git a/src/components/Modals/HLS/Deposit/SubTitles.tsx b/src/components/Modals/HLS/Deposit/SubTitles.tsx index 73d02a51..987f2bac 100644 --- a/src/components/Modals/HLS/Deposit/SubTitles.tsx +++ b/src/components/Modals/HLS/Deposit/SubTitles.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' import React from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import { ExclamationMarkTriangle } from 'components/Icons' -import Text from 'components/Text' -import WarningMessages from 'components/WarningMessages' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { ExclamationMarkTriangle } from 'components/common/Icons' +import Text from 'components/common/Text' +import WarningMessages from 'components/common/WarningMessages' import useAllAssets from 'hooks/assets/useAllAssets' import { BNCoin } from 'types/classes/BNCoin' import { formatAmountWithSymbol, formatLeverage } from 'utils/formatters' diff --git a/src/components/Modals/HLS/Deposit/Summary/ApyBreakdown.tsx b/src/components/Modals/HLS/Deposit/Summary/ApyBreakdown.tsx index 051d6921..8e4b0ddb 100644 --- a/src/components/Modals/HLS/Deposit/Summary/ApyBreakdown.tsx +++ b/src/components/Modals/HLS/Deposit/Summary/ApyBreakdown.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' interface Props { items: { title: string; amount: number }[] diff --git a/src/components/Modals/HLS/Deposit/Summary/AssetSummary.tsx b/src/components/Modals/HLS/Deposit/Summary/AssetSummary.tsx index db4e08e8..cfee11fe 100644 --- a/src/components/Modals/HLS/Deposit/Summary/AssetSummary.tsx +++ b/src/components/Modals/HLS/Deposit/Summary/AssetSummary.tsx @@ -1,10 +1,10 @@ import React from 'react' -import AmountAndValue from 'components/AmountAndValue' -import AssetImage from 'components/Asset/AssetImage' -import { FormattedNumber } from 'components/FormattedNumber' +import AmountAndValue from 'components/common/AmountAndValue' +import AssetImage from 'components/common/assets/AssetImage' +import { FormattedNumber } from 'components/common/FormattedNumber' import Container from 'components/Modals/HLS/Deposit/Summary/Container' -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { amount: BigNumber diff --git a/src/components/Modals/HLS/Deposit/Summary/Container.tsx b/src/components/Modals/HLS/Deposit/Summary/Container.tsx index 39ae06f2..8f14c571 100644 --- a/src/components/Modals/HLS/Deposit/Summary/Container.tsx +++ b/src/components/Modals/HLS/Deposit/Summary/Container.tsx @@ -1,6 +1,6 @@ import React from 'react' -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { children: React.ReactNode diff --git a/src/components/Modals/HLS/Deposit/Summary/YourPosition.tsx b/src/components/Modals/HLS/Deposit/Summary/YourPosition.tsx index 3e0e57a2..ff4673c3 100644 --- a/src/components/Modals/HLS/Deposit/Summary/YourPosition.tsx +++ b/src/components/Modals/HLS/Deposit/Summary/YourPosition.tsx @@ -1,12 +1,12 @@ import React, { useMemo } from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import { InfoCircle } from 'components/Icons' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { InfoCircle } from 'components/common/Icons' import AprBreakdown from 'components/Modals/HLS/Deposit/Summary/ApyBreakdown' import Container from 'components/Modals/HLS/Deposit/Summary/Container' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import { BNCoin } from 'types/classes/BNCoin' interface Props { diff --git a/src/components/Modals/HLS/Deposit/Summary/index.tsx b/src/components/Modals/HLS/Deposit/Summary/index.tsx index a23140c4..43099a90 100644 --- a/src/components/Modals/HLS/Deposit/Summary/index.tsx +++ b/src/components/Modals/HLS/Deposit/Summary/index.tsx @@ -1,7 +1,7 @@ import React from 'react' -import Button from 'components/Button' -import { ArrowRight } from 'components/Icons' +import Button from 'components/common/Button' +import { ArrowRight } from 'components/common/Icons' import AssetSummary from 'components/Modals/HLS/Deposit/Summary/AssetSummary' import YourPosition from 'components/Modals/HLS/Deposit/Summary/YourPosition' import useBorrowAsset from 'hooks/useBorrowAsset' diff --git a/src/components/Modals/HLS/Deposit/index.tsx b/src/components/Modals/HLS/Deposit/index.tsx index c451112c..95d90401 100644 --- a/src/components/Modals/HLS/Deposit/index.tsx +++ b/src/components/Modals/HLS/Deposit/index.tsx @@ -1,6 +1,6 @@ import React, { useMemo, useState } from 'react' -import Accordion from 'components/Accordion' +import Accordion from 'components/common/Accordion' import useStakingController from 'components/Modals/HLS/Deposit//useStakingController' import useVaultController from 'components/Modals/HLS/Deposit//useVaultController' import useAccordionItems from 'components/Modals/HLS/Deposit/useAccordionItems' diff --git a/src/components/Modals/HLS/Header.tsx b/src/components/Modals/HLS/Header.tsx index f38c5b07..d9f747fd 100644 --- a/src/components/Modals/HLS/Header.tsx +++ b/src/components/Modals/HLS/Header.tsx @@ -1,8 +1,8 @@ import React from 'react' -import DoubleLogo from 'components/DoubleLogo' -import HLSTag from 'components/HLS/HLSTag' -import Text from 'components/Text' +import DoubleLogo from 'components/common/DoubleLogo' +import HLSTag from 'components/hls/HLSTag' +import Text from 'components/common/Text' interface Props { primaryAsset: Asset diff --git a/src/components/Modals/HLS/Manage/ChangeLeverage.tsx b/src/components/Modals/HLS/Manage/ChangeLeverage.tsx index aba96e38..b69cd869 100644 --- a/src/components/Modals/HLS/Manage/ChangeLeverage.tsx +++ b/src/components/Modals/HLS/Manage/ChangeLeverage.tsx @@ -1,8 +1,8 @@ import React, { useCallback, useMemo, useState } from 'react' -import Button from 'components/Button' +import Button from 'components/common/Button' import LeverageSummary from 'components/Modals/HLS/Deposit/LeverageSummary' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import { BN_ZERO } from 'constants/math' diff --git a/src/components/Modals/HLS/Manage/Deposit.tsx b/src/components/Modals/HLS/Manage/Deposit.tsx index d325fc06..5c840a21 100644 --- a/src/components/Modals/HLS/Manage/Deposit.tsx +++ b/src/components/Modals/HLS/Manage/Deposit.tsx @@ -1,12 +1,12 @@ import BigNumber from 'bignumber.js' import React, { useCallback, useMemo } from 'react' -import Button from 'components/Button' -import Divider from 'components/Divider' -import SummaryItems from 'components/SummaryItems' -import Switch from 'components/Switch' -import Text from 'components/Text' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import Button from 'components/common/Button' +import Divider from 'components/common/Divider' +import SummaryItems from 'components/common/SummaryItems' +import Switch from 'components/common/Switch' +import Text from 'components/common/Text' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { BN_ZERO } from 'constants/math' import useAllAssets from 'hooks/assets/useAllAssets' import useDepositActions from 'hooks/HLS/useDepositActions' diff --git a/src/components/Modals/HLS/Manage/Repay.tsx b/src/components/Modals/HLS/Manage/Repay.tsx index 62da7f47..292fd33c 100644 --- a/src/components/Modals/HLS/Manage/Repay.tsx +++ b/src/components/Modals/HLS/Manage/Repay.tsx @@ -1,9 +1,9 @@ import BigNumber from 'bignumber.js' import { useCallback, useMemo } from 'react' -import Button from 'components/Button' -import SummaryItems from 'components/SummaryItems' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import Button from 'components/common/Button' +import SummaryItems from 'components/common/SummaryItems' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { BN_ZERO } from 'constants/math' import useCurrentWalletBalance from 'hooks/useCurrentWalletBalance' import { useUpdatedAccount } from 'hooks/useUpdatedAccount' diff --git a/src/components/Modals/HLS/Manage/Withdraw.tsx b/src/components/Modals/HLS/Manage/Withdraw.tsx index a48bdb22..3adbe65e 100644 --- a/src/components/Modals/HLS/Manage/Withdraw.tsx +++ b/src/components/Modals/HLS/Manage/Withdraw.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useMemo } from 'react' -import Button from 'components/Button' -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import Button from 'components/common/Button' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { BN_ZERO } from 'constants/math' import useAllAssets from 'hooks/assets/useAllAssets' import useHealthComputer from 'hooks/useHealthComputer' diff --git a/src/components/Modals/HLS/index.tsx b/src/components/Modals/HLS/index.tsx index cb06ddc6..89b25210 100644 --- a/src/components/Modals/HLS/index.tsx +++ b/src/components/Modals/HLS/index.tsx @@ -1,6 +1,6 @@ import React from 'react' -import Modal from 'components/Modal' +import Modal from 'components/Modals/Modal' import Content from 'components/Modals/HLS/Deposit' import Header from 'components/Modals/HLS/Header' import useAsset from 'hooks/assets/useAsset' diff --git a/src/components/Modals/LendAndReclaim/DetailsHeader.tsx b/src/components/Modals/LendAndReclaim/DetailsHeader.tsx index f2439db7..8a906bb7 100644 --- a/src/components/Modals/LendAndReclaim/DetailsHeader.tsx +++ b/src/components/Modals/LendAndReclaim/DetailsHeader.tsx @@ -1,6 +1,6 @@ -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import TitleAndSubCell from 'components/TitleAndSubCell' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import useAssetIncentivesApy from 'hooks/useAssetIncentiveApy' import useCurrentWalletBalance from 'hooks/useCurrentWalletBalance' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Modal.tsx b/src/components/Modals/Modal.tsx similarity index 95% rename from src/components/Modal.tsx rename to src/components/Modals/Modal.tsx index 14175290..5b9a9480 100644 --- a/src/components/Modal.tsx +++ b/src/components/Modals/Modal.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import { ReactNode, useEffect, useRef } from 'react' -import EscButton from 'components/Button/EscButton' -import Card from 'components/Card' +import EscButton from 'components/common/Button/EscButton' +import Card from 'components/common/Card' export interface ModalProps { header: string | ReactNode diff --git a/src/components/Modals/ModalContentWithSummary.tsx b/src/components/Modals/ModalContentWithSummary.tsx index e1d2db4f..cd0ef2a9 100644 --- a/src/components/Modals/ModalContentWithSummary.tsx +++ b/src/components/Modals/ModalContentWithSummary.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' import React from 'react' -import AccountSummary from 'components/Account/AccountSummary' -import Card from 'components/Card' -import { CircularProgress } from 'components/CircularProgress' -import Modal, { ModalProps } from 'components/Modal' +import AccountSummary from 'components/account/AccountSummary' +import Card from 'components/common/Card' +import { CircularProgress } from 'components/common/CircularProgress' +import Modal, { ModalProps } from 'components/Modals/Modal' import useStore from 'store' interface Props extends ModalProps { diff --git a/src/components/Modals/Settings/SettingsOptions.tsx b/src/components/Modals/Settings/SettingsOptions.tsx index 1a22bbfb..70e3f0da 100644 --- a/src/components/Modals/Settings/SettingsOptions.tsx +++ b/src/components/Modals/Settings/SettingsOptions.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { ReactNode } from 'react' -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { label: string diff --git a/src/components/Modals/Settings/SettingsSwitch.tsx b/src/components/Modals/Settings/SettingsSwitch.tsx index 65c09779..a52f7607 100644 --- a/src/components/Modals/Settings/SettingsSwitch.tsx +++ b/src/components/Modals/Settings/SettingsSwitch.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' -import Switch from 'components/Switch' -import Text from 'components/Text' +import Switch from 'components/common/Switch' +import Text from 'components/common/Text' interface Props { onChange: (value: boolean) => void diff --git a/src/components/Modals/Settings/index.tsx b/src/components/Modals/Settings/index.tsx index 05775ee2..82bfc8a1 100644 --- a/src/components/Modals/Settings/index.tsx +++ b/src/components/Modals/Settings/index.tsx @@ -1,16 +1,16 @@ import classNames from 'classnames' import { useCallback, useMemo, useState } from 'react' -import AssetImage from 'components/Asset/AssetImage' -import Button from 'components/Button' -import { ArrowCircle, Enter } from 'components/Icons' -import Modal from 'components/Modal' +import AssetImage from 'components/common/assets/AssetImage' +import Button from 'components/common/Button' +import { ArrowCircle, Enter } from 'components/common/Icons' +import Modal from 'components/Modals/Modal' import SettingsOptions from 'components/Modals/Settings/SettingsOptions' import SettingsSwitch from 'components/Modals/Settings/SettingsSwitch' -import NumberInput from 'components/NumberInput' -import Select from 'components/Select' -import Text from 'components/Text' -import { TextLink } from 'components/TextLink' +import NumberInput from 'components/common/NumberInput' +import Select from 'components/common/Select' +import Text from 'components/common/Text' +import { TextLink } from 'components/common/TextLink' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import { BN_ZERO } from 'constants/math' diff --git a/src/components/Modals/Unlock/UnlockModalContent.tsx b/src/components/Modals/Unlock/UnlockModalContent.tsx index a42205b4..7d06a391 100644 --- a/src/components/Modals/Unlock/UnlockModalContent.tsx +++ b/src/components/Modals/Unlock/UnlockModalContent.tsx @@ -1,6 +1,6 @@ -import Button from 'components/Button' +import Button from 'components/common/Button' import { NoIcon, YesIcon } from 'components/Modals/AlertDialog/ButtonIcons' -import Text from 'components/Text' +import Text from 'components/common/Text' import useAccountId from 'hooks/useAccountId' import useStore from 'store' diff --git a/src/components/Modals/Unlock/index.tsx b/src/components/Modals/Unlock/index.tsx index 591acda8..d5ef9ded 100644 --- a/src/components/Modals/Unlock/index.tsx +++ b/src/components/Modals/Unlock/index.tsx @@ -1,5 +1,5 @@ -import { LockUnlocked } from 'components/Icons' -import Modal from 'components/Modal' +import { LockUnlocked } from 'components/common/Icons' +import Modal from 'components/Modals/Modal' import UnlockModalContent from 'components/Modals/Unlock/UnlockModalContent' import useStore from 'store' diff --git a/src/components/Modals/Vault/VaultBorrowings.tsx b/src/components/Modals/Vault/VaultBorrowings.tsx index 7771168f..9ba691c1 100644 --- a/src/components/Modals/Vault/VaultBorrowings.tsx +++ b/src/components/Modals/Vault/VaultBorrowings.tsx @@ -1,14 +1,14 @@ import BigNumber from 'bignumber.js' import React, { useEffect, useMemo, useState } from 'react' -import Button from 'components/Button' -import DepositCapMessage from 'components/DepositCapMessage' -import DisplayCurrency from 'components/DisplayCurrency' -import Divider from 'components/Divider' -import { ArrowRight, ExclamationMarkCircled } from 'components/Icons' -import Index from 'components/Slider' -import Text from 'components/Text' -import TokenInput from 'components/TokenInput' +import Button from 'components/common/Button' +import DepositCapMessage from 'components/common/DepositCapMessage' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Divider from 'components/common/Divider' +import { ArrowRight, ExclamationMarkCircled } from 'components/common/Icons' +import Index from 'components/common/Slider' +import Text from 'components/common/Text' +import TokenInput from 'components/common/TokenInput' import { BN_ZERO } from 'constants/math' import { ORACLE_DENOM } from 'constants/oracle' import useAllAssets from 'hooks/assets/useAllAssets' diff --git a/src/components/Modals/Vault/VaultBorrowingsSubTitle.tsx b/src/components/Modals/Vault/VaultBorrowingsSubTitle.tsx index b3d52466..76b1588a 100644 --- a/src/components/Modals/Vault/VaultBorrowingsSubTitle.tsx +++ b/src/components/Modals/Vault/VaultBorrowingsSubTitle.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import { useMemo } from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import Text from 'components/Text' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Text from 'components/common/Text' import { BN_ZERO } from 'constants/math' import { ORACLE_DENOM } from 'constants/oracle' import useAllAssets from 'hooks/assets/useAllAssets' diff --git a/src/components/Modals/Vault/VaultDeposits.tsx b/src/components/Modals/Vault/VaultDeposits.tsx index 0354a084..2bc4eb91 100644 --- a/src/components/Modals/Vault/VaultDeposits.tsx +++ b/src/components/Modals/Vault/VaultDeposits.tsx @@ -1,16 +1,16 @@ import BigNumber from 'bignumber.js' import { useMemo, useState } from 'react' -import Button from 'components/Button' -import DepositCapMessage from 'components/DepositCapMessage' -import DisplayCurrency from 'components/DisplayCurrency' -import Divider from 'components/Divider' -import { Gauge } from 'components/Gauge' -import { ArrowRight, ExclamationMarkCircled } from 'components/Icons' -import Slider from 'components/Slider' -import Switch from 'components/Switch' -import Text from 'components/Text' -import TokenInput from 'components/TokenInput' +import Button from 'components/common/Button' +import DepositCapMessage from 'components/common/DepositCapMessage' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Divider from 'components/common/Divider' +import { Gauge } from 'components/common/Gauge' +import { ArrowRight, ExclamationMarkCircled } from 'components/common/Icons' +import Slider from 'components/common/Slider' +import Switch from 'components/common/Switch' +import Text from 'components/common/Text' +import TokenInput from 'components/common/TokenInput' import { BN_ZERO } from 'constants/math' import { ORACLE_DENOM } from 'constants/oracle' import useAllAssets from 'hooks/assets/useAllAssets' diff --git a/src/components/Modals/Vault/VaultDepositsSubTitle.tsx b/src/components/Modals/Vault/VaultDepositsSubTitle.tsx index b437b4ad..78f61c55 100644 --- a/src/components/Modals/Vault/VaultDepositsSubTitle.tsx +++ b/src/components/Modals/Vault/VaultDepositsSubTitle.tsx @@ -2,8 +2,8 @@ import BigNumber from 'bignumber.js' import classNames from 'classnames' import { useMemo } from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import Text from 'components/Text' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Text from 'components/common/Text' import { ORACLE_DENOM } from 'constants/oracle' import useAllAssets from 'hooks/assets/useAllAssets' import usePrices from 'hooks/usePrices' diff --git a/src/components/Modals/Vault/VaultModalContent.tsx b/src/components/Modals/Vault/VaultModalContent.tsx index a4ded72c..4a11fb10 100644 --- a/src/components/Modals/Vault/VaultModalContent.tsx +++ b/src/components/Modals/Vault/VaultModalContent.tsx @@ -1,12 +1,12 @@ import { useCallback, useMemo, useState } from 'react' -import Accordion from 'components/Accordion' -import AccountSummary from 'components/Account/AccountSummary' +import Accordion from 'components/common/Accordion' +import AccountSummary from 'components/account/AccountSummary' import VaultBorrowings from 'components/Modals/Vault/VaultBorrowings' import VaultBorrowingsSubTitle from 'components/Modals/Vault/VaultBorrowingsSubTitle' import VaultDeposit from 'components/Modals/Vault/VaultDeposits' import VaultDepositSubTitle from 'components/Modals/Vault/VaultDepositsSubTitle' -import Text from 'components/Text' +import Text from 'components/common/Text' import { BN_ZERO } from 'constants/math' import useAllAssets from 'hooks/assets/useAllAssets' import useDepositVault from 'hooks/broadcast/useDepositVault' diff --git a/src/components/Modals/Vault/VaultModalContentHeader.tsx b/src/components/Modals/Vault/VaultModalContentHeader.tsx index b0b3352f..8a422527 100644 --- a/src/components/Modals/Vault/VaultModalContentHeader.tsx +++ b/src/components/Modals/Vault/VaultModalContentHeader.tsx @@ -1,8 +1,8 @@ import { useMemo } from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import TitleAndSubCell from 'components/TitleAndSubCell' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import { BN_ZERO } from 'constants/math' import { PRICE_ORACLE_DECIMALS } from 'constants/query' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Modals/Vault/index.tsx b/src/components/Modals/Vault/index.tsx index 6e5ea862..72ae6e41 100644 --- a/src/components/Modals/Vault/index.tsx +++ b/src/components/Modals/Vault/index.tsx @@ -1,13 +1,13 @@ import moment from 'moment' import { useCallback, useMemo } from 'react' -import DoubleLogo from 'components/DoubleLogo' -import { InfoCircle } from 'components/Icons' -import Modal from 'components/Modal' +import DoubleLogo from 'components/common/DoubleLogo' +import { InfoCircle } from 'components/common/Icons' +import Modal from 'components/Modals/Modal' import VaultModalContent from 'components/Modals/Vault/VaultModalContent' import VaultModalContentHeader from 'components/Modals/Vault/VaultModalContentHeader' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import useAsset from 'hooks/assets/useAsset' import useCurrentAccount from 'hooks/useCurrentAccount' import useStore from 'store' diff --git a/src/components/Modals/WalletAssets/WalletAssetsModalContent.tsx b/src/components/Modals/WalletAssets/WalletAssetsModalContent.tsx index 2f39fd2b..b3993968 100644 --- a/src/components/Modals/WalletAssets/WalletAssetsModalContent.tsx +++ b/src/components/Modals/WalletAssets/WalletAssetsModalContent.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo, useState } from 'react' import AssetSelectTable from 'components/Modals/AssetsSelect/AssetSelectTable' -import SearchBar from 'components/SearchBar' +import SearchBar from 'components/common/SearchBar' import useAllAssets from 'hooks/assets/useAllAssets' import useStore from 'store' import { byDenom } from 'utils/array' diff --git a/src/components/Modals/WalletAssets/index.tsx b/src/components/Modals/WalletAssets/index.tsx index ec805db7..cd5c6c4a 100644 --- a/src/components/Modals/WalletAssets/index.tsx +++ b/src/components/Modals/WalletAssets/index.tsx @@ -1,9 +1,9 @@ import { useCallback, useState } from 'react' -import Button from 'components/Button' -import Modal from 'components/Modal' +import Button from 'components/common/Button' +import Modal from 'components/Modals/Modal' import WalletAssetsModalContent from 'components/Modals/WalletAssets/WalletAssetsModalContent' -import Text from 'components/Text' +import Text from 'components/common/Text' import useStore from 'store' export default function WalletAssetsModal() { diff --git a/src/components/Modals/WithdrawFromVaultsModal.tsx b/src/components/Modals/WithdrawFromVaultsModal.tsx index 7be4b269..d3b59434 100644 --- a/src/components/Modals/WithdrawFromVaultsModal.tsx +++ b/src/components/Modals/WithdrawFromVaultsModal.tsx @@ -1,10 +1,10 @@ -import Button from 'components/Button' -import { CircularProgress } from 'components/CircularProgress' -import DisplayCurrency from 'components/DisplayCurrency' -import DoubleLogo from 'components/DoubleLogo' -import { FormattedNumber } from 'components/FormattedNumber' -import Modal from 'components/Modal' -import Text from 'components/Text' +import Button from 'components/common/Button' +import { CircularProgress } from 'components/common/CircularProgress' +import DisplayCurrency from 'components/common/DisplayCurrency' +import DoubleLogo from 'components/common/DoubleLogo' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Modal from 'components/Modals/Modal' +import Text from 'components/common/Text' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import { ORACLE_DENOM } from 'constants/oracle' diff --git a/src/components/Wallet/RecentTransactions.tsx b/src/components/Wallet/RecentTransactions.tsx index a7d4dedc..5dfe2cd3 100644 --- a/src/components/Wallet/RecentTransactions.tsx +++ b/src/components/Wallet/RecentTransactions.tsx @@ -1,11 +1,11 @@ import classNames from 'classnames' import moment from 'moment' -import Card from 'components/Card' -import Divider from 'components/Divider' -import Text from 'components/Text' -import { TextLink } from 'components/TextLink' -import { generateToastContent } from 'components/Toaster' +import Card from 'components/common/Card' +import Divider from 'components/common/Divider' +import Text from 'components/common/Text' +import { TextLink } from 'components/common/TextLink' +import { generateToastContent } from 'components/common/Toaster' import useTransactions from 'hooks/localStorage/useTransactions' import useStore from 'store' diff --git a/src/components/Wallet/WalletBridges.tsx b/src/components/Wallet/WalletBridges.tsx index 89614af2..25f35999 100644 --- a/src/components/Wallet/WalletBridges.tsx +++ b/src/components/Wallet/WalletBridges.tsx @@ -2,10 +2,10 @@ import { useShuttle } from '@delphi-labs/shuttle-react' import Image from 'next/image' import { useCallback, useEffect, useMemo } from 'react' -import Button from 'components/Button' -import FullOverlayContent from 'components/FullOverlayContent' -import { ChevronRight } from 'components/Icons' -import Text from 'components/Text' +import Button from 'components/common/Button' +import FullOverlayContent from 'components/common/FullOverlayContent' +import { ChevronRight } from 'components/common/Icons' +import Text from 'components/common/Text' import WalletFetchBalancesAndAccounts from 'components/Wallet/WalletFetchBalancesAndAccounts' import WalletSelect from 'components/Wallet/WalletSelect' import { BRIDGES } from 'constants/bridges' diff --git a/src/components/Wallet/WalletConnectButton.tsx b/src/components/Wallet/WalletConnectButton.tsx index b0f2f74f..54c71755 100644 --- a/src/components/Wallet/WalletConnectButton.tsx +++ b/src/components/Wallet/WalletConnectButton.tsx @@ -1,8 +1,8 @@ import { ReactNode, useCallback } from 'react' -import Button from 'components/Button' -import { Wallet } from 'components/Icons' -import TermsOfService from 'components/TermsOfService' +import Button from 'components/common/Button' +import { Wallet } from 'components/common/Icons' +import TermsOfService from 'components/common/TermsOfService' import WalletSelect from 'components/Wallet/WalletSelect' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Wallet/WalletConnectedButton.tsx b/src/components/Wallet/WalletConnectedButton.tsx index 9afb70f0..00ffdf03 100644 --- a/src/components/Wallet/WalletConnectedButton.tsx +++ b/src/components/Wallet/WalletConnectedButton.tsx @@ -6,12 +6,12 @@ import { useCallback, useEffect, useState } from 'react' import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' import useClipboard from 'react-use-clipboard' -import Button from 'components/Button' -import { CircularProgress } from 'components/CircularProgress' -import { FormattedNumber } from 'components/FormattedNumber' -import { Check, Copy, ExternalLink, Wallet } from 'components/Icons' -import Overlay from 'components/Overlay' -import Text from 'components/Text' +import Button from 'components/common/Button' +import { CircularProgress } from 'components/common/CircularProgress' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { Check, Copy, ExternalLink, Wallet } from 'components/common/Icons' +import Overlay from 'components/common/Overlay' +import Text from 'components/common/Text' import RecentTransactions from 'components/Wallet/RecentTransactions' import WalletSelect from 'components/Wallet/WalletSelect' import chains from 'configs/chains' diff --git a/src/components/Wallet/WalletConnecting.tsx b/src/components/Wallet/WalletConnecting.tsx index 8bc0511d..e9a3e5fa 100644 --- a/src/components/Wallet/WalletConnecting.tsx +++ b/src/components/Wallet/WalletConnecting.tsx @@ -2,8 +2,8 @@ import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate' import { useShuttle } from '@delphi-labs/shuttle-react' import { useCallback, useEffect, useMemo } from 'react' -import { CircularProgress } from 'components/CircularProgress' -import FullOverlayContent from 'components/FullOverlayContent' +import { CircularProgress } from 'components/common/CircularProgress' +import FullOverlayContent from 'components/common/FullOverlayContent' import WalletSelect from 'components/Wallet//WalletSelect' import WalletFetchBalancesAndAccounts from 'components/Wallet/WalletFetchBalancesAndAccounts' import useChainConfig from 'hooks/useChainConfig' diff --git a/src/components/Wallet/WalletFetchBalancesAndAccounts.tsx b/src/components/Wallet/WalletFetchBalancesAndAccounts.tsx index dd6fdf27..162a60f8 100644 --- a/src/components/Wallet/WalletFetchBalancesAndAccounts.tsx +++ b/src/components/Wallet/WalletFetchBalancesAndAccounts.tsx @@ -1,9 +1,9 @@ import { Suspense, useEffect, useMemo } from 'react' import { useLocation, useNavigate, useParams, useSearchParams } from 'react-router-dom' -import AccountCreateFirst from 'components/Account/AccountCreateFirst' -import { CircularProgress } from 'components/CircularProgress' -import FullOverlayContent from 'components/FullOverlayContent' +import AccountCreateFirst from 'components/account/AccountCreateFirst' +import { CircularProgress } from 'components/common/CircularProgress' +import FullOverlayContent from 'components/common/FullOverlayContent' import WalletBridges from 'components/Wallet/WalletBridges' import useAccountIds from 'hooks/accounts/useAccountIds' import useBaseAsset from 'hooks/assets/useBasetAsset' diff --git a/src/components/Wallet/WalletSelect.tsx b/src/components/Wallet/WalletSelect.tsx index b5c04c13..91be68a0 100644 --- a/src/components/Wallet/WalletSelect.tsx +++ b/src/components/Wallet/WalletSelect.tsx @@ -4,10 +4,10 @@ import Image from 'next/image' import React, { useEffect, useState } from 'react' import QRCode from 'react-qr-code' -import Button from 'components/Button' -import FullOverlayContent from 'components/FullOverlayContent' -import { ChevronLeft, ChevronRight } from 'components/Icons' -import Text from 'components/Text' +import Button from 'components/common/Button' +import FullOverlayContent from 'components/common/FullOverlayContent' +import { ChevronLeft, ChevronRight } from 'components/common/Icons' +import Text from 'components/common/Text' import WalletConnecting from 'components/Wallet/WalletConnecting' import { WALLETS } from 'constants/wallets' import useStore from 'store' diff --git a/src/components/Account/AccountBalancesTable/Columns/Apy.tsx b/src/components/account/AccountBalancesTable/Columns/Apy.tsx similarity index 92% rename from src/components/Account/AccountBalancesTable/Columns/Apy.tsx rename to src/components/account/AccountBalancesTable/Columns/Apy.tsx index b210fd2d..d54ee089 100644 --- a/src/components/Account/AccountBalancesTable/Columns/Apy.tsx +++ b/src/components/account/AccountBalancesTable/Columns/Apy.tsx @@ -1,4 +1,4 @@ -import AssetRate from 'components/Asset/AssetRate' +import AssetRate from 'components/common/assets/AssetRate' import { byDenom } from 'utils/array' export const APY_META = { accessorKey: 'apy', header: 'APY', meta: { className: 'w-30' } } diff --git a/src/components/Account/AccountBalancesTable/Columns/Asset.tsx b/src/components/account/AccountBalancesTable/Columns/Asset.tsx similarity index 94% rename from src/components/Account/AccountBalancesTable/Columns/Asset.tsx rename to src/components/account/AccountBalancesTable/Columns/Asset.tsx index fc26c5a5..486c032d 100644 --- a/src/components/Account/AccountBalancesTable/Columns/Asset.tsx +++ b/src/components/account/AccountBalancesTable/Columns/Asset.tsx @@ -1,4 +1,4 @@ -import Text from 'components/Text' +import Text from 'components/common/Text' export const ASSET_META = { accessorKey: 'symbol', header: 'Asset', id: 'symbol' } interface Props { diff --git a/src/components/Account/AccountBalancesTable/Columns/LiqPrice.tsx b/src/components/account/AccountBalancesTable/Columns/LiqPrice.tsx similarity index 91% rename from src/components/Account/AccountBalancesTable/Columns/LiqPrice.tsx rename to src/components/account/AccountBalancesTable/Columns/LiqPrice.tsx index f82bc914..11230cc3 100644 --- a/src/components/Account/AccountBalancesTable/Columns/LiqPrice.tsx +++ b/src/components/account/AccountBalancesTable/Columns/LiqPrice.tsx @@ -1,9 +1,9 @@ import { useEffect, useMemo, useState } from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import { InfoCircle } from 'components/Icons' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { InfoCircle } from 'components/common/Icons' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import useLiquidationPrice from 'hooks/useLiquidationPrice' import { BNCoin } from 'types/classes/BNCoin' import { LiquidationPriceKind } from 'utils/health_computer' diff --git a/src/components/Account/AccountBalancesTable/Columns/Price.tsx b/src/components/account/AccountBalancesTable/Columns/Price.tsx similarity index 91% rename from src/components/Account/AccountBalancesTable/Columns/Price.tsx rename to src/components/account/AccountBalancesTable/Columns/Price.tsx index c45c9465..d51ffe1b 100644 --- a/src/components/Account/AccountBalancesTable/Columns/Price.tsx +++ b/src/components/account/AccountBalancesTable/Columns/Price.tsx @@ -1,4 +1,4 @@ -import DisplayCurrency from 'components/DisplayCurrency' +import DisplayCurrency from 'components/common/DisplayCurrency' import usePrice from 'hooks/usePrice' import { BNCoin } from 'types/classes/BNCoin' import { BN } from 'utils/helpers' diff --git a/src/components/Account/AccountBalancesTable/Columns/Size.tsx b/src/components/account/AccountBalancesTable/Columns/Size.tsx similarity index 93% rename from src/components/Account/AccountBalancesTable/Columns/Size.tsx rename to src/components/account/AccountBalancesTable/Columns/Size.tsx index 00514636..87c3a91d 100644 --- a/src/components/Account/AccountBalancesTable/Columns/Size.tsx +++ b/src/components/account/AccountBalancesTable/Columns/Size.tsx @@ -1,8 +1,8 @@ import { Row } from '@tanstack/react-table' import classNames from 'classnames' -import { getAmountChangeColor } from 'components/Account/AccountBalancesTable/functions' -import { FormattedNumber } from 'components/FormattedNumber' +import { getAmountChangeColor } from 'components/account/AccountBalancesTable/functions' +import { FormattedNumber } from 'components/common/FormattedNumber' import { MAX_AMOUNT_DECIMALS, MIN_AMOUNT } from 'constants/math' import { formatAmountToPrecision } from 'utils/formatters' diff --git a/src/components/Account/AccountBalancesTable/Columns/Value.tsx b/src/components/account/AccountBalancesTable/Columns/Value.tsx similarity index 89% rename from src/components/Account/AccountBalancesTable/Columns/Value.tsx rename to src/components/account/AccountBalancesTable/Columns/Value.tsx index 918fdf8a..b56f8077 100644 --- a/src/components/Account/AccountBalancesTable/Columns/Value.tsx +++ b/src/components/account/AccountBalancesTable/Columns/Value.tsx @@ -1,8 +1,8 @@ import { Row } from '@tanstack/react-table' import classNames from 'classnames' -import { getAmountChangeColor } from 'components/Account/AccountBalancesTable/functions' -import DisplayCurrency from 'components/DisplayCurrency' +import { getAmountChangeColor } from 'components/account/AccountBalancesTable/functions' +import DisplayCurrency from 'components/common/DisplayCurrency' import { ORACLE_DENOM } from 'constants/oracle' import { BNCoin } from 'types/classes/BNCoin' import { BN } from 'utils/helpers' diff --git a/src/components/Account/AccountBalancesTable/Columns/useAccountBalancesColumns.tsx b/src/components/account/AccountBalancesTable/Columns/useAccountBalancesColumns.tsx similarity index 88% rename from src/components/Account/AccountBalancesTable/Columns/useAccountBalancesColumns.tsx rename to src/components/account/AccountBalancesTable/Columns/useAccountBalancesColumns.tsx index 95f14d1a..fc276ad6 100644 --- a/src/components/Account/AccountBalancesTable/Columns/useAccountBalancesColumns.tsx +++ b/src/components/account/AccountBalancesTable/Columns/useAccountBalancesColumns.tsx @@ -1,18 +1,18 @@ import { ColumnDef, Row } from '@tanstack/react-table' import { useMemo } from 'react' -import Apy, { APY_META } from 'components/Account/AccountBalancesTable/Columns/Apy' -import Asset, { ASSET_META } from 'components/Account/AccountBalancesTable/Columns/Asset' -import LiqPrice, { LIQ_META } from 'components/Account/AccountBalancesTable/Columns/LiqPrice' -import Price, { PRICE_META } from 'components/Account/AccountBalancesTable/Columns/Price' +import Apy, { APY_META } from 'components/account/AccountBalancesTable/Columns/Apy' +import Asset, { ASSET_META } from 'components/account/AccountBalancesTable/Columns/Asset' +import LiqPrice, { LIQ_META } from 'components/account/AccountBalancesTable/Columns/LiqPrice' +import Price, { PRICE_META } from 'components/account/AccountBalancesTable/Columns/Price' import Size, { SIZE_META, sizeSortingFn, -} from 'components/Account/AccountBalancesTable/Columns/Size' +} from 'components/account/AccountBalancesTable/Columns/Size' import Value, { VALUE_META, valueSortingFn, -} from 'components/Account/AccountBalancesTable/Columns/Value' +} from 'components/account/AccountBalancesTable/Columns/Value' import useMarketAssets from 'hooks/markets/useMarketAssets' import useHealthComputer from 'hooks/useHealthComputer' import useStore from 'store' diff --git a/src/components/Account/AccountBalancesTable/functions.ts b/src/components/account/AccountBalancesTable/functions.ts similarity index 100% rename from src/components/Account/AccountBalancesTable/functions.ts rename to src/components/account/AccountBalancesTable/functions.ts diff --git a/src/components/Account/AccountBalancesTable/index.tsx b/src/components/account/AccountBalancesTable/index.tsx similarity index 88% rename from src/components/Account/AccountBalancesTable/index.tsx rename to src/components/account/AccountBalancesTable/index.tsx index 591aadbc..5c5b60f2 100644 --- a/src/components/Account/AccountBalancesTable/index.tsx +++ b/src/components/account/AccountBalancesTable/index.tsx @@ -1,12 +1,12 @@ import classNames from 'classnames' import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' -import useAccountBalancesColumns from 'components/Account/AccountBalancesTable/Columns/useAccountBalancesColumns' -import useAccountBalanceData from 'components/Account/AccountBalancesTable/useAccountBalanceData' -import AccountFundFullPage from 'components/Account/AccountFund/AccountFundFullPage' -import ActionButton from 'components/Button/ActionButton' -import Card from 'components/Card' -import Table from 'components/Table' +import useAccountBalancesColumns from 'components/account/AccountBalancesTable/Columns/useAccountBalancesColumns' +import useAccountBalanceData from 'components/account/AccountBalancesTable/useAccountBalanceData' +import AccountFundFullPage from 'components/account/AccountFund/AccountFundFullPage' +import ActionButton from 'components/common/Button/ActionButton' +import Card from 'components/common/Card' +import Table from 'components/common/Table' import ConditionalWrapper from 'hocs/ConditionalWrapper' import useCurrentAccount from 'hooks/useCurrentAccount' import useStore from 'store' diff --git a/src/components/Account/AccountBalancesTable/useAccountBalanceData.tsx b/src/components/account/AccountBalancesTable/useAccountBalanceData.tsx similarity index 98% rename from src/components/Account/AccountBalancesTable/useAccountBalanceData.tsx rename to src/components/account/AccountBalancesTable/useAccountBalanceData.tsx index c460a663..8478afd8 100644 --- a/src/components/Account/AccountBalancesTable/useAccountBalanceData.tsx +++ b/src/components/account/AccountBalancesTable/useAccountBalanceData.tsx @@ -3,7 +3,7 @@ import { useMemo } from 'react' import { getAssetAccountBalanceRow, getVaultAccountBalanceRow, -} from 'components/Account/AccountBalancesTable/functions' +} from 'components/account/AccountBalancesTable/functions' import useAllAssets from 'hooks/assets/useAllAssets' import useHLSStakingAssets from 'hooks/useHLSStakingAssets' import usePrices from 'hooks/usePrices' diff --git a/src/components/Account/AccountComposition.tsx b/src/components/account/AccountComposition.tsx similarity index 96% rename from src/components/Account/AccountComposition.tsx rename to src/components/account/AccountComposition.tsx index bb5cb881..6fd5c9e2 100644 --- a/src/components/Account/AccountComposition.tsx +++ b/src/components/account/AccountComposition.tsx @@ -2,10 +2,10 @@ import BigNumber from 'bignumber.js' import classNames from 'classnames' import { useMemo } from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import { ArrowRight } from 'components/Icons' -import Text from 'components/Text' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { ArrowRight } from 'components/common/Icons' +import Text from 'components/common/Text' import { BN_ZERO, MAX_AMOUNT_DECIMALS } from 'constants/math' import { ORACLE_DENOM } from 'constants/oracle' import useAllAssets from 'hooks/assets/useAllAssets' diff --git a/src/components/Account/AccountCreateFirst.tsx b/src/components/account/AccountCreateFirst.tsx similarity index 92% rename from src/components/Account/AccountCreateFirst.tsx rename to src/components/account/AccountCreateFirst.tsx index e2ea005e..dda50671 100644 --- a/src/components/Account/AccountCreateFirst.tsx +++ b/src/components/account/AccountCreateFirst.tsx @@ -1,8 +1,8 @@ import { useCallback, useEffect } from 'react' import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' -import AccountFundFullPage from 'components/Account/AccountFund/AccountFundFullPage' -import FullOverlayContent from 'components/FullOverlayContent' +import AccountFundFullPage from 'components/account/AccountFund/AccountFundFullPage' +import FullOverlayContent from 'components/common/FullOverlayContent' import WalletSelect from 'components/Wallet/WalletSelect' import useToggle from 'hooks/useToggle' import useStore from 'store' diff --git a/src/components/Account/AccountDetails/AccountDetailsLeverage.tsx b/src/components/account/AccountDetails/AccountDetailsLeverage.tsx similarity index 91% rename from src/components/Account/AccountDetails/AccountDetailsLeverage.tsx rename to src/components/account/AccountDetails/AccountDetailsLeverage.tsx index 98b25ff3..e9771eea 100644 --- a/src/components/Account/AccountDetails/AccountDetailsLeverage.tsx +++ b/src/components/account/AccountDetails/AccountDetailsLeverage.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' -import { FormattedNumber } from 'components/FormattedNumber' -import { ArrowRight } from 'components/Icons' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { ArrowRight } from 'components/common/Icons' interface Props { leverage: number diff --git a/src/components/Account/AccountDetails/Skeleton.tsx b/src/components/account/AccountDetails/Skeleton.tsx similarity index 89% rename from src/components/Account/AccountDetails/Skeleton.tsx rename to src/components/account/AccountDetails/Skeleton.tsx index 59a124c6..d4dc5202 100644 --- a/src/components/Account/AccountDetails/Skeleton.tsx +++ b/src/components/account/AccountDetails/Skeleton.tsx @@ -1,6 +1,6 @@ -import { HealthGauge } from 'components/Account/Health/HealthGauge' -import Loading from 'components/Loading' -import Text from 'components/Text' +import { HealthGauge } from 'components/account/Health/HealthGauge' +import Loading from 'components/common/Loading' +import Text from 'components/common/Text' export default function Skeleton() { return ( diff --git a/src/components/Account/AccountDetails/index.tsx b/src/components/account/AccountDetails/index.tsx similarity index 91% rename from src/components/Account/AccountDetails/index.tsx rename to src/components/account/AccountDetails/index.tsx index 07168361..a1c5a49c 100644 --- a/src/components/Account/AccountDetails/index.tsx +++ b/src/components/account/AccountDetails/index.tsx @@ -2,18 +2,18 @@ import classNames from 'classnames' import { useCallback, useMemo } from 'react' import { useLocation } from 'react-router-dom' -import AccountBalancesTable from 'components/Account/AccountBalancesTable' -import AccountComposition from 'components/Account/AccountComposition' -import AccountDetailsLeverage from 'components/Account/AccountDetails/AccountDetailsLeverage' -import Skeleton from 'components/Account/AccountDetails/Skeleton' -import { HealthGauge } from 'components/Account/Health/HealthGauge' -import EscButton from 'components/Button/EscButton' -import { glowElement } from 'components/Button/utils' -import Card from 'components/Card' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import { ThreeDots } from 'components/Icons' -import Text from 'components/Text' +import AccountBalancesTable from 'components/account/AccountBalancesTable' +import AccountComposition from 'components/account/AccountComposition' +import AccountDetailsLeverage from 'components/account/AccountDetails/AccountDetailsLeverage' +import Skeleton from 'components/account/AccountDetails/Skeleton' +import { HealthGauge } from 'components/account/Health/HealthGauge' +import EscButton from 'components/common/Button/EscButton' +import { glowElement } from 'components/common/Button/utils' +import Card from 'components/common/Card' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { ThreeDots } from 'components/common/Icons' +import Text from 'components/common/Text' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import { ORACLE_DENOM } from 'constants/oracle' diff --git a/src/components/Account/AccountFund/AccountFundContent.tsx b/src/components/account/AccountFund/AccountFundContent.tsx similarity index 94% rename from src/components/Account/AccountFund/AccountFundContent.tsx rename to src/components/account/AccountFund/AccountFundContent.tsx index 2e67df83..11b0c5c0 100644 --- a/src/components/Account/AccountFund/AccountFundContent.tsx +++ b/src/components/account/AccountFund/AccountFundContent.tsx @@ -1,12 +1,12 @@ import classNames from 'classnames' import { useCallback, useEffect, useMemo, useState } from 'react' -import AccountFundRow from 'components/Account/AccountFund/AccountFundRow' -import Button from 'components/Button' -import DepositCapMessage from 'components/DepositCapMessage' -import { ArrowRight, Plus } from 'components/Icons' -import SwitchAutoLend from 'components/Switch/SwitchAutoLend' -import Text from 'components/Text' +import AccountFundRow from 'components/account/AccountFund/AccountFundRow' +import Button from 'components/common/Button' +import DepositCapMessage from 'components/common/DepositCapMessage' +import { ArrowRight, Plus } from 'components/common/Icons' +import SwitchAutoLend from 'components/common/Switch/SwitchAutoLend' +import Text from 'components/common/Text' import WalletBridges from 'components/Wallet/WalletBridges' import { BN_ZERO } from 'constants/math' import useBaseAsset from 'hooks/assets/useBasetAsset' diff --git a/src/components/Account/AccountFund/AccountFundFullPage.tsx b/src/components/account/AccountFund/AccountFundFullPage.tsx similarity index 85% rename from src/components/Account/AccountFund/AccountFundFullPage.tsx rename to src/components/account/AccountFund/AccountFundFullPage.tsx index d4e3c64e..4f143977 100644 --- a/src/components/Account/AccountFund/AccountFundFullPage.tsx +++ b/src/components/account/AccountFund/AccountFundFullPage.tsx @@ -1,9 +1,9 @@ import { useEffect, useState } from 'react' -import AccountFundContent from 'components/Account/AccountFund/AccountFundContent' -import Card from 'components/Card' -import { CircularProgress } from 'components/CircularProgress' -import FullOverlayContent from 'components/FullOverlayContent' +import AccountFundContent from 'components/account/AccountFund/AccountFundContent' +import Card from 'components/common/Card' +import { CircularProgress } from 'components/common/CircularProgress' +import FullOverlayContent from 'components/common/FullOverlayContent' import useAccounts from 'hooks/accounts/useAccounts' import useAccountId from 'hooks/useAccountId' import useCurrentAccount from 'hooks/useCurrentAccount' diff --git a/src/components/Account/AccountFund/AccountFundRow.tsx b/src/components/account/AccountFund/AccountFundRow.tsx similarity index 90% rename from src/components/Account/AccountFund/AccountFundRow.tsx rename to src/components/account/AccountFund/AccountFundRow.tsx index a0de837e..a5a37a26 100644 --- a/src/components/Account/AccountFund/AccountFundRow.tsx +++ b/src/components/account/AccountFund/AccountFundRow.tsx @@ -1,4 +1,4 @@ -import TokenInputWithSlider from 'components/TokenInput/TokenInputWithSlider' +import TokenInputWithSlider from 'components/common/TokenInput/TokenInputWithSlider' import { BN_ZERO } from 'constants/math' import useAsset from 'hooks/assets/useAsset' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Account/AccountList/AccountStats.tsx b/src/components/account/AccountList/AccountStats.tsx similarity index 94% rename from src/components/Account/AccountList/AccountStats.tsx rename to src/components/account/AccountList/AccountStats.tsx index 48db6b4e..0da66691 100644 --- a/src/components/Account/AccountList/AccountStats.tsx +++ b/src/components/account/AccountList/AccountStats.tsx @@ -1,10 +1,10 @@ import { useCallback, useMemo } from 'react' -import AccountFundFullPage from 'components/Account/AccountFund/AccountFundFullPage' -import Skeleton from 'components/Account/AccountList/Skeleton' -import Button from 'components/Button' -import { ArrowDownLine, ArrowUpLine, TrashBin } from 'components/Icons' -import SwitchAutoLend from 'components/Switch/SwitchAutoLend' +import AccountFundFullPage from 'components/account/AccountFund/AccountFundFullPage' +import Skeleton from 'components/account/AccountList/Skeleton' +import Button from 'components/common/Button' +import { ArrowDownLine, ArrowUpLine, TrashBin } from 'components/common/Icons' +import SwitchAutoLend from 'components/common/Switch/SwitchAutoLend' import useAccount from 'hooks/accounts/useAccount' import useAllAssets from 'hooks/assets/useAllAssets' import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData' diff --git a/src/components/Account/AccountList/Skeleton.tsx b/src/components/account/AccountList/Skeleton.tsx similarity index 79% rename from src/components/Account/AccountList/Skeleton.tsx rename to src/components/account/AccountList/Skeleton.tsx index 57caef23..9cdae6e6 100644 --- a/src/components/Account/AccountList/Skeleton.tsx +++ b/src/components/account/AccountList/Skeleton.tsx @@ -1,10 +1,10 @@ -import HealthBar from 'components/Account/Health/HealthBar' -import HealthIcon from 'components/Account/Health/HealthIcon' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import { ArrowChartLineUp } from 'components/Icons' -import Loading from 'components/Loading' -import Text from 'components/Text' +import HealthBar from 'components/account/Health/HealthBar' +import HealthIcon from 'components/account/Health/HealthIcon' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { ArrowChartLineUp } from 'components/common/Icons' +import Loading from 'components/common/Loading' +import Text from 'components/common/Text' import { ORACLE_DENOM } from 'constants/oracle' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Account/AccountList/index.tsx b/src/components/account/AccountList/index.tsx similarity index 93% rename from src/components/Account/AccountList/index.tsx rename to src/components/account/AccountList/index.tsx index 72ce00c3..65bad2a0 100644 --- a/src/components/Account/AccountList/index.tsx +++ b/src/components/account/AccountList/index.tsx @@ -2,10 +2,10 @@ import classNames from 'classnames' import { useEffect } from 'react' import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' -import AccountStats from 'components/Account/AccountList/AccountStats' -import Card from 'components/Card' -import Radio from 'components/Radio' -import Text from 'components/Text' +import AccountStats from 'components/account/AccountList/AccountStats' +import Card from 'components/common/Card' +import Radio from 'components/common/Radio' +import Text from 'components/common/Text' import useAccountIds from 'hooks/accounts/useAccountIds' import useAccountId from 'hooks/useAccountId' import useStore from 'store' diff --git a/src/components/Account/AccountMenu.tsx b/src/components/account/AccountMenu.tsx similarity index 82% rename from src/components/Account/AccountMenu.tsx rename to src/components/account/AccountMenu.tsx index 19f8e154..5495fae9 100644 --- a/src/components/Account/AccountMenu.tsx +++ b/src/components/account/AccountMenu.tsx @@ -1,7 +1,7 @@ import { Suspense } from 'react' -import AccountMenuContent from 'components/Account/AccountMenuContent' -import Loading from 'components/Loading' +import AccountMenuContent from 'components/account/AccountMenuContent' +import Loading from 'components/common/Loading' import useAccountIds from 'hooks/accounts/useAccountIds' import useStore from 'store' diff --git a/src/components/Account/AccountMenuContent.tsx b/src/components/account/AccountMenuContent.tsx similarity index 92% rename from src/components/Account/AccountMenuContent.tsx rename to src/components/account/AccountMenuContent.tsx index d688ebf8..3bf03670 100644 --- a/src/components/Account/AccountMenuContent.tsx +++ b/src/components/account/AccountMenuContent.tsx @@ -2,13 +2,13 @@ import classNames from 'classnames' import { useCallback } from 'react' import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' -import AccountCreateFirst from 'components/Account/AccountCreateFirst' -import AccountFund from 'components/Account/AccountFund/AccountFundFullPage' -import AccountList from 'components/Account/AccountList' -import Button from 'components/Button' -import { Account, Plus, PlusCircled } from 'components/Icons' -import Overlay from 'components/Overlay' -import Text from 'components/Text' +import AccountCreateFirst from 'components/account/AccountCreateFirst' +import AccountFund from 'components/account/AccountFund/AccountFundFullPage' +import AccountList from 'components/account/AccountList' +import Button from 'components/common/Button' +import { Account, Plus, PlusCircled } from 'components/common/Icons' +import Overlay from 'components/common/Overlay' +import Text from 'components/common/Text' import WalletBridges from 'components/Wallet/WalletBridges' import useAccountIds from 'hooks/accounts/useAccountIds' import useBaseAsset from 'hooks/assets/useBasetAsset' diff --git a/src/components/Account/AccountSummary.tsx b/src/components/account/AccountSummary.tsx similarity index 92% rename from src/components/Account/AccountSummary.tsx rename to src/components/account/AccountSummary.tsx index 283e24b5..a7f011fc 100644 --- a/src/components/Account/AccountSummary.tsx +++ b/src/components/account/AccountSummary.tsx @@ -1,15 +1,15 @@ import classNames from 'classnames' import { HTMLAttributes, useCallback, useMemo } from 'react' -import Accordion from 'components/Accordion' -import AccountBalancesTable from 'components/Account/AccountBalancesTable' -import AccountComposition from 'components/Account/AccountComposition' -import HealthBar from 'components/Account/Health/HealthBar' -import Card from 'components/Card' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import { ArrowRight } from 'components/Icons' -import Text from 'components/Text' +import Accordion from 'components/common/Accordion' +import AccountBalancesTable from 'components/account/AccountBalancesTable' +import AccountComposition from 'components/account/AccountComposition' +import HealthBar from 'components/account/Health/HealthBar' +import Card from 'components/common/Card' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { ArrowRight } from 'components/common/Icons' +import Text from 'components/common/Text' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import { BN_ZERO } from 'constants/math' diff --git a/src/components/Account/CurrentAccountSummary.tsx b/src/components/account/CurrentAccountSummary.tsx similarity index 79% rename from src/components/Account/CurrentAccountSummary.tsx rename to src/components/account/CurrentAccountSummary.tsx index 6bab7c22..27ee139f 100644 --- a/src/components/Account/CurrentAccountSummary.tsx +++ b/src/components/account/CurrentAccountSummary.tsx @@ -1,4 +1,4 @@ -import AccountSummary from 'components/Account/AccountSummary' +import AccountSummary from 'components/account/AccountSummary' import useCurrentAccount from 'hooks/useCurrentAccount' function CurrentAccountSummary() { diff --git a/src/components/Account/Health/HealthBar.tsx b/src/components/account/Health/HealthBar.tsx similarity index 98% rename from src/components/Account/Health/HealthBar.tsx rename to src/components/account/Health/HealthBar.tsx index 816e7cdd..d0a186d3 100644 --- a/src/components/Account/Health/HealthBar.tsx +++ b/src/components/account/Health/HealthBar.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import { useMemo } from 'react' -import HealthIcon from 'components/Account/Health/HealthIcon' -import HealthTooltip from 'components/Account/Health/HealthTooltip' +import HealthIcon from 'components/account/Health/HealthIcon' +import HealthTooltip from 'components/account/Health/HealthTooltip' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Account/Health/HealthGauge.tsx b/src/components/account/Health/HealthGauge.tsx similarity index 98% rename from src/components/Account/Health/HealthGauge.tsx rename to src/components/account/Health/HealthGauge.tsx index 09904120..dcbee855 100644 --- a/src/components/Account/Health/HealthGauge.tsx +++ b/src/components/account/Health/HealthGauge.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import { useMemo } from 'react' -import HealthIcon from 'components/Account/Health/HealthIcon' -import HealthTooltip from 'components/Account/Health/HealthTooltip' +import HealthIcon from 'components/account/Health/HealthIcon' +import HealthTooltip from 'components/account/Health/HealthTooltip' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Account/Health/HealthIcon.tsx b/src/components/account/Health/HealthIcon.tsx similarity index 90% rename from src/components/Account/Health/HealthIcon.tsx rename to src/components/account/Health/HealthIcon.tsx index 0a6e6631..858cb0bf 100644 --- a/src/components/Account/Health/HealthIcon.tsx +++ b/src/components/account/Health/HealthIcon.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames' -import { ExclamationMarkCircled, Heart } from 'components/Icons' +import { ExclamationMarkCircled, Heart } from 'components/common/Icons' interface Props { isLoading: boolean diff --git a/src/components/Account/Health/HealthTooltip.tsx b/src/components/account/Health/HealthTooltip.tsx similarity index 92% rename from src/components/Account/Health/HealthTooltip.tsx rename to src/components/account/Health/HealthTooltip.tsx index 1e356fc0..6328f941 100644 --- a/src/components/Account/Health/HealthTooltip.tsx +++ b/src/components/account/Health/HealthTooltip.tsx @@ -1,8 +1,8 @@ import { ReactElement, useMemo } from 'react' -import { CircularProgress } from 'components/CircularProgress' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import { CircularProgress } from 'components/common/CircularProgress' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import { BN } from 'utils/helpers' interface Props { diff --git a/src/components/Account/RiskChart.tsx b/src/components/account/RiskChart.tsx similarity index 96% rename from src/components/Account/RiskChart.tsx rename to src/components/account/RiskChart.tsx index 6cb97697..08bd53bf 100644 --- a/src/components/Account/RiskChart.tsx +++ b/src/components/account/RiskChart.tsx @@ -9,8 +9,8 @@ import { YAxis, } from 'recharts' -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import { BN_ZERO } from 'constants/math' diff --git a/src/components/Borrow/BorrowActionButtons.tsx b/src/components/borrow/BorrowActionButtons.tsx similarity index 88% rename from src/components/Borrow/BorrowActionButtons.tsx rename to src/components/borrow/BorrowActionButtons.tsx index 3bf0d7fc..51ec2a5e 100644 --- a/src/components/Borrow/BorrowActionButtons.tsx +++ b/src/components/borrow/BorrowActionButtons.tsx @@ -1,8 +1,8 @@ import { useCallback } from 'react' -import Button from 'components/Button' -import ActionButton from 'components/Button/ActionButton' -import { HandCoins, Plus } from 'components/Icons' +import Button from 'components/common/Button' +import ActionButton from 'components/common/Button/ActionButton' +import { HandCoins, Plus } from 'components/common/Icons' import useMarketEnabledAssets from 'hooks/assets/useMarketEnabledAssets' import useStore from 'store' diff --git a/src/components/Borrow/BorrowIntro.tsx b/src/components/borrow/BorrowIntro.tsx similarity index 88% rename from src/components/Borrow/BorrowIntro.tsx rename to src/components/borrow/BorrowIntro.tsx index 6be0f92b..9bd808be 100644 --- a/src/components/Borrow/BorrowIntro.tsx +++ b/src/components/borrow/BorrowIntro.tsx @@ -1,4 +1,4 @@ -import Intro from 'components/Intro' +import Intro from 'components/common/Intro' export default function BorrowIntro() { return ( diff --git a/src/components/Borrow/Borrowings.tsx b/src/components/borrow/Borrowings.tsx similarity index 88% rename from src/components/Borrow/Borrowings.tsx rename to src/components/borrow/Borrowings.tsx index 29914f6b..ff353ec5 100644 --- a/src/components/Borrow/Borrowings.tsx +++ b/src/components/borrow/Borrowings.tsx @@ -1,5 +1,5 @@ -import AvailableBorrowingsTable from 'components/Borrow/Table/AvailableBorrowingsTable' -import DepositedBorrowingsTable from 'components/Borrow/Table/DepositedBorrowingsTable' +import AvailableBorrowingsTable from 'components/borrow/Table/AvailableBorrowingsTable' +import DepositedBorrowingsTable from 'components/borrow/Table/DepositedBorrowingsTable' import { BN_ZERO } from 'constants/math' import useBorrowEnabledAssets from 'hooks/assets/useBorrowEnabledAssets' import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData' diff --git a/src/components/Borrow/Table/AvailableBorrowingsTable.tsx b/src/components/borrow/Table/AvailableBorrowingsTable.tsx similarity index 74% rename from src/components/Borrow/Table/AvailableBorrowingsTable.tsx rename to src/components/borrow/Table/AvailableBorrowingsTable.tsx index 05d91c60..652baaeb 100644 --- a/src/components/Borrow/Table/AvailableBorrowingsTable.tsx +++ b/src/components/borrow/Table/AvailableBorrowingsTable.tsx @@ -2,12 +2,12 @@ import { Row } from '@tanstack/react-table' import { Table as TanstackTable } from '@tanstack/table-core/build/lib/types' import { useCallback } from 'react' -import BorrowActionButtons from 'components/Borrow/BorrowActionButtons' -import { NAME_META } from 'components/Borrow/Table/Columns/Name' -import useAvailableColumns from 'components/Borrow/Table/Columns/useAvailableColumns' -import MarketDetails from 'components/MarketDetails' -import Table from 'components/Table' -import ActionButtonRow from 'components/Table/ActionButtonRow' +import BorrowActionButtons from 'components/borrow/BorrowActionButtons' +import { NAME_META } from 'components/borrow/Table/Columns/Name' +import useAvailableColumns from 'components/borrow/Table/Columns/useAvailableColumns' +import MarketDetails from 'components/common/MarketDetails' +import Table from 'components/common/Table' +import ActionButtonRow from 'components/common/Table/ActionButtonRow' type Props = { data: BorrowMarketTableData[] diff --git a/src/components/Borrow/Table/Columns/BorrowRate.tsx b/src/components/borrow/Table/Columns/BorrowRate.tsx similarity index 80% rename from src/components/Borrow/Table/Columns/BorrowRate.tsx rename to src/components/borrow/Table/Columns/BorrowRate.tsx index 9652c4e2..b0b88d50 100644 --- a/src/components/Borrow/Table/Columns/BorrowRate.tsx +++ b/src/components/borrow/Table/Columns/BorrowRate.tsx @@ -1,5 +1,5 @@ -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' export const BORROW_RATE_META = { accessorKey: 'borrowRate', diff --git a/src/components/Borrow/Table/Columns/Debt.tsx b/src/components/borrow/Table/Columns/Debt.tsx similarity index 95% rename from src/components/Borrow/Table/Columns/Debt.tsx rename to src/components/borrow/Table/Columns/Debt.tsx index 2eb5dfeb..ebf827b7 100644 --- a/src/components/Borrow/Table/Columns/Debt.tsx +++ b/src/components/borrow/Table/Columns/Debt.tsx @@ -1,6 +1,6 @@ import { Row } from '@tanstack/react-table' -import AmountAndValue from 'components/AmountAndValue' +import AmountAndValue from 'components/common/AmountAndValue' import { BN_ZERO } from 'constants/math' import useMarketEnabledAssets from 'hooks/assets/useMarketEnabledAssets' import { byDenom } from 'utils/array' diff --git a/src/components/Borrow/Table/Columns/Liquidity.tsx b/src/components/borrow/Table/Columns/Liquidity.tsx similarity index 90% rename from src/components/Borrow/Table/Columns/Liquidity.tsx rename to src/components/borrow/Table/Columns/Liquidity.tsx index 03663dd6..78353068 100644 --- a/src/components/Borrow/Table/Columns/Liquidity.tsx +++ b/src/components/borrow/Table/Columns/Liquidity.tsx @@ -1,7 +1,7 @@ import { Row } from '@tanstack/react-table' -import AmountAndValue from 'components/AmountAndValue' -import Loading from 'components/Loading' +import AmountAndValue from 'components/common/AmountAndValue' +import Loading from 'components/common/Loading' import { BN_ZERO } from 'constants/math' import useAsset from 'hooks/assets/useAsset' import { demagnify } from 'utils/formatters' diff --git a/src/components/Borrow/Table/Columns/Manage.tsx b/src/components/borrow/Table/Columns/Manage.tsx similarity index 85% rename from src/components/Borrow/Table/Columns/Manage.tsx rename to src/components/borrow/Table/Columns/Manage.tsx index 8af2ea79..f6515b14 100644 --- a/src/components/Borrow/Table/Columns/Manage.tsx +++ b/src/components/borrow/Table/Columns/Manage.tsx @@ -1,4 +1,4 @@ -import { ChevronDown, ChevronUp } from 'components/Icons' +import { ChevronDown, ChevronUp } from 'components/common/Icons' export const MANAGE_META = { accessorKey: 'manage', diff --git a/src/components/Borrow/Table/Columns/Name.tsx b/src/components/borrow/Table/Columns/Name.tsx similarity index 77% rename from src/components/Borrow/Table/Columns/Name.tsx rename to src/components/borrow/Table/Columns/Name.tsx index 352a61bb..6ec22845 100644 --- a/src/components/Borrow/Table/Columns/Name.tsx +++ b/src/components/borrow/Table/Columns/Name.tsx @@ -1,5 +1,5 @@ -import AssetImage from 'components/Asset/AssetImage' -import TitleAndSubCell from 'components/TitleAndSubCell' +import AssetImage from 'components/common/assets/AssetImage' +import TitleAndSubCell from 'components/common/TitleAndSubCell' export const NAME_META = { accessorKey: 'asset.symbol', header: 'Asset', id: 'symbol' } diff --git a/src/components/Borrow/Table/Columns/useAvailableColumns.tsx b/src/components/borrow/Table/Columns/useAvailableColumns.tsx similarity index 76% rename from src/components/Borrow/Table/Columns/useAvailableColumns.tsx rename to src/components/borrow/Table/Columns/useAvailableColumns.tsx index 72822f67..16eb04d1 100644 --- a/src/components/Borrow/Table/Columns/useAvailableColumns.tsx +++ b/src/components/borrow/Table/Columns/useAvailableColumns.tsx @@ -1,13 +1,13 @@ import { ColumnDef } from '@tanstack/react-table' import { useMemo } from 'react' -import BorrowRate, { BORROW_RATE_META } from 'components/Borrow/Table/Columns/BorrowRate' +import BorrowRate, { BORROW_RATE_META } from 'components/borrow/Table/Columns/BorrowRate' import Liquidity, { LIQUIDITY_META, liquiditySortingFn, -} from 'components/Borrow/Table/Columns/Liquidity' -import Manage, { MANAGE_META } from 'components/Borrow/Table/Columns/Manage' -import Name, { NAME_META } from 'components/Borrow/Table/Columns/Name' +} from 'components/borrow/Table/Columns/Liquidity' +import Manage, { MANAGE_META } from 'components/borrow/Table/Columns/Manage' +import Name, { NAME_META } from 'components/borrow/Table/Columns/Name' export default function useAvailableColumns() { return useMemo[]>(() => { diff --git a/src/components/Borrow/Table/Columns/useDepositedColumns.tsx b/src/components/borrow/Table/Columns/useDepositedColumns.tsx similarity index 75% rename from src/components/Borrow/Table/Columns/useDepositedColumns.tsx rename to src/components/borrow/Table/Columns/useDepositedColumns.tsx index 1fe2e63b..fa657241 100644 --- a/src/components/Borrow/Table/Columns/useDepositedColumns.tsx +++ b/src/components/borrow/Table/Columns/useDepositedColumns.tsx @@ -1,14 +1,14 @@ import { ColumnDef } from '@tanstack/react-table' import { useMemo } from 'react' -import BorrowRate, { BORROW_RATE_META } from 'components/Borrow/Table/Columns/BorrowRate' -import Debt, { DEBT_META, debtSortingFn } from 'components/Borrow/Table/Columns/Debt' +import BorrowRate, { BORROW_RATE_META } from 'components/borrow/Table/Columns/BorrowRate' +import Debt, { DEBT_META, debtSortingFn } from 'components/borrow/Table/Columns/Debt' import Liquidity, { LIQUIDITY_META, liquiditySortingFn, -} from 'components/Borrow/Table/Columns/Liquidity' -import Manage, { MANAGE_META } from 'components/Borrow/Table/Columns/Manage' -import Name, { NAME_META } from 'components/Borrow/Table/Columns/Name' +} from 'components/borrow/Table/Columns/Liquidity' +import Manage, { MANAGE_META } from 'components/borrow/Table/Columns/Manage' +import Name, { NAME_META } from 'components/borrow/Table/Columns/Name' export default function useDepositedColumns() { return useMemo[]>(() => { diff --git a/src/components/Borrow/Table/DepositedBorrowingsTable.tsx b/src/components/borrow/Table/DepositedBorrowingsTable.tsx similarity index 70% rename from src/components/Borrow/Table/DepositedBorrowingsTable.tsx rename to src/components/borrow/Table/DepositedBorrowingsTable.tsx index f37b4e31..85b6fa96 100644 --- a/src/components/Borrow/Table/DepositedBorrowingsTable.tsx +++ b/src/components/borrow/Table/DepositedBorrowingsTable.tsx @@ -1,12 +1,12 @@ import { Row } from '@tanstack/react-table' import { useCallback } from 'react' -import BorrowActionButtons from 'components/Borrow/BorrowActionButtons' -import { NAME_META } from 'components/Borrow/Table/Columns/Name' -import useDepositedColumns from 'components/Borrow/Table/Columns/useDepositedColumns' -import MarketDetails from 'components/MarketDetails' -import Table from 'components/Table' -import ActionButtonRow from 'components/Table/ActionButtonRow' +import BorrowActionButtons from 'components/borrow/BorrowActionButtons' +import { NAME_META } from 'components/borrow/Table/Columns/Name' +import useDepositedColumns from 'components/borrow/Table/Columns/useDepositedColumns' +import MarketDetails from 'components/common/MarketDetails' +import Table from 'components/common/Table' +import ActionButtonRow from 'components/common/Table/ActionButtonRow' type Props = { data: BorrowMarketTableData[] diff --git a/src/components/Accordion.tsx b/src/components/common/Accordion.tsx similarity index 84% rename from src/components/Accordion.tsx rename to src/components/common/Accordion.tsx index f358a925..78fcff17 100644 --- a/src/components/Accordion.tsx +++ b/src/components/common/Accordion.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' -import AccordionContent, { Item } from 'components/AccordionContent' -import Card from 'components/Card' +import AccordionContent, { Item } from 'components/common/AccordionContent' +import Card from 'components/common/Card' interface Props { items: Item[] diff --git a/src/components/AccordionContent.tsx b/src/components/common/AccordionContent.tsx similarity index 91% rename from src/components/AccordionContent.tsx rename to src/components/common/AccordionContent.tsx index d20afeff..42bf067a 100644 --- a/src/components/AccordionContent.tsx +++ b/src/components/common/AccordionContent.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' -import { ChevronDown, ChevronRight } from 'components/Icons' -import Text from 'components/Text' +import { ChevronDown, ChevronRight } from 'components/common/Icons' +import Text from 'components/common/Text' interface Props { item: Item diff --git a/src/components/AmountAndValue.tsx b/src/components/common/AmountAndValue.tsx similarity index 88% rename from src/components/AmountAndValue.tsx rename to src/components/common/AmountAndValue.tsx index d00c47c9..60f634fc 100644 --- a/src/components/AmountAndValue.tsx +++ b/src/components/common/AmountAndValue.tsx @@ -1,5 +1,5 @@ -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' import { MAX_AMOUNT_DECIMALS, MIN_AMOUNT } from 'constants/math' import { BNCoin } from 'types/classes/BNCoin' import { demagnify } from 'utils/formatters' diff --git a/src/components/AvailableLiquidityMessage.tsx b/src/components/common/AvailableLiquidityMessage.tsx similarity index 89% rename from src/components/AvailableLiquidityMessage.tsx rename to src/components/common/AvailableLiquidityMessage.tsx index 6d57ab70..78c891e4 100644 --- a/src/components/AvailableLiquidityMessage.tsx +++ b/src/components/common/AvailableLiquidityMessage.tsx @@ -1,5 +1,5 @@ -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' interface Props { availableLiquidity: BigNumber diff --git a/src/components/Background.tsx b/src/components/common/Background.tsx similarity index 100% rename from src/components/Background.tsx rename to src/components/common/Background.tsx diff --git a/src/components/BorrowCapacity.tsx b/src/components/common/BorrowCapacity.tsx similarity index 96% rename from src/components/BorrowCapacity.tsx rename to src/components/common/BorrowCapacity.tsx index 9c4740f9..c715e50e 100644 --- a/src/components/BorrowCapacity.tsx +++ b/src/components/common/BorrowCapacity.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import { useEffect, useState } from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Button/ActionButton.tsx b/src/components/common/Button/ActionButton.tsx similarity index 84% rename from src/components/Button/ActionButton.tsx rename to src/components/common/Button/ActionButton.tsx index 3372b94c..7cf580df 100644 --- a/src/components/Button/ActionButton.tsx +++ b/src/components/common/Button/ActionButton.tsx @@ -1,9 +1,9 @@ import { useCallback } from 'react' -import AccountCreateFirst from 'components/Account/AccountCreateFirst' -import { ACCOUNT_MENU_BUTTON_ID } from 'components/Account/AccountMenuContent' -import Button from 'components/Button' -import { Account, PlusCircled } from 'components/Icons' +import AccountCreateFirst from 'components/account/AccountCreateFirst' +import { ACCOUNT_MENU_BUTTON_ID } from 'components/account/AccountMenuContent' +import Button from 'components/common/Button/index' +import { Account, PlusCircled } from 'components/common/Icons' import WalletConnectButton from 'components/Wallet/WalletConnectButton' import useAccountIds from 'hooks/accounts/useAccountIds' import useAccountId from 'hooks/useAccountId' diff --git a/src/components/Button/DropDownButton.tsx b/src/components/common/Button/DropDownButton.tsx similarity index 88% rename from src/components/Button/DropDownButton.tsx rename to src/components/common/Button/DropDownButton.tsx index 76516216..60bd189a 100644 --- a/src/components/Button/DropDownButton.tsx +++ b/src/components/common/Button/DropDownButton.tsx @@ -1,7 +1,7 @@ -import Button from 'components/Button' -import { ChevronDown } from 'components/Icons' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Button from 'components/common/Button/index' +import { ChevronDown } from 'components/common/Icons' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import useToggle from 'hooks/useToggle' interface Props extends ButtonProps { diff --git a/src/components/Button/EscButton.tsx b/src/components/common/Button/EscButton.tsx similarity index 89% rename from src/components/Button/EscButton.tsx rename to src/components/common/Button/EscButton.tsx index 45dbf401..737576fb 100644 --- a/src/components/Button/EscButton.tsx +++ b/src/components/common/Button/EscButton.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect } from 'react' -import Button from 'components/Button' -import { Cross } from 'components/Icons' +import Button from 'components/common/Button/index' +import { Cross } from 'components/common/Icons' interface Props { enableKeyPress?: boolean diff --git a/src/components/Button/constants.ts b/src/components/common/Button/constants.ts similarity index 100% rename from src/components/Button/constants.ts rename to src/components/common/Button/constants.ts diff --git a/src/components/Button/index.tsx b/src/components/common/Button/index.tsx similarity index 94% rename from src/components/Button/index.tsx rename to src/components/common/Button/index.tsx index a5661646..97b66920 100644 --- a/src/components/Button/index.tsx +++ b/src/components/common/Button/index.tsx @@ -12,10 +12,10 @@ import { buttonVariantClasses, circularProgressSize, focusClasses, -} from 'components/Button/constants' -import { glowElement } from 'components/Button/utils' -import { CircularProgress } from 'components/CircularProgress' -import { ChevronDown } from 'components/Icons' +} from 'components/common/Button/constants' +import { glowElement } from 'components/common/Button/utils' +import { CircularProgress } from 'components/common/CircularProgress' +import { ChevronDown } from 'components/common/Icons' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Button/utils.tsx b/src/components/common/Button/utils.tsx similarity index 100% rename from src/components/Button/utils.tsx rename to src/components/common/Button/utils.tsx diff --git a/src/components/Card.tsx b/src/components/common/Card.tsx similarity index 96% rename from src/components/Card.tsx rename to src/components/common/Card.tsx index 1c3df37a..451c2033 100644 --- a/src/components/Card.tsx +++ b/src/components/common/Card.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { ReactElement, ReactNode } from 'react' -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { children: ReactNode diff --git a/src/components/CheckMark.tsx b/src/components/common/CheckMark.tsx similarity index 96% rename from src/components/CheckMark.tsx rename to src/components/common/CheckMark.tsx index 27574800..b4af3bc9 100644 --- a/src/components/CheckMark.tsx +++ b/src/components/common/CheckMark.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames' -import { CheckCircled } from 'components/Icons' +import { CheckCircled } from 'components/common/Icons' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Checkbox.tsx b/src/components/common/Checkbox.tsx similarity index 93% rename from src/components/Checkbox.tsx rename to src/components/common/Checkbox.tsx index f065edb1..13bafc59 100644 --- a/src/components/Checkbox.tsx +++ b/src/components/common/Checkbox.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' -import { Check } from 'components/Icons' -import Text from 'components/Text' +import { Check } from 'components/common/Icons' +import Text from 'components/common/Text' interface Props { checked: boolean diff --git a/src/components/CircularProgress.tsx b/src/components/common/CircularProgress.tsx similarity index 100% rename from src/components/CircularProgress.tsx rename to src/components/common/CircularProgress.tsx diff --git a/src/components/DefaultPageHead.tsx b/src/components/common/DefaultPageHead.tsx similarity index 100% rename from src/components/DefaultPageHead.tsx rename to src/components/common/DefaultPageHead.tsx diff --git a/src/components/DepositCapCell.tsx b/src/components/common/DepositCapCell.tsx similarity index 88% rename from src/components/DepositCapCell.tsx rename to src/components/common/DepositCapCell.tsx index f30b53cd..7b93d8a0 100644 --- a/src/components/DepositCapCell.tsx +++ b/src/components/common/DepositCapCell.tsx @@ -1,5 +1,5 @@ -import { FormattedNumber } from 'components/FormattedNumber' -import TitleAndSubCell from 'components/TitleAndSubCell' +import { FormattedNumber } from 'components/common/FormattedNumber' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import { VAULT_DEPOSIT_BUFFER } from 'constants/vaults' import useAsset from 'hooks/assets/useAsset' diff --git a/src/components/DepositCapMessage.tsx b/src/components/common/DepositCapMessage.tsx similarity index 90% rename from src/components/DepositCapMessage.tsx rename to src/components/common/DepositCapMessage.tsx index 9023bbe8..b3fb4ae0 100644 --- a/src/components/DepositCapMessage.tsx +++ b/src/components/common/DepositCapMessage.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import { HTMLAttributes } from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import { InfoCircle } from 'components/Icons' -import Text from 'components/Text' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { InfoCircle } from 'components/common/Icons' +import Text from 'components/common/Text' import useAsset from 'hooks/assets/useAsset' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/DisplayCurrency.tsx b/src/components/common/DisplayCurrency.tsx similarity index 97% rename from src/components/DisplayCurrency.tsx rename to src/components/common/DisplayCurrency.tsx index fcd89566..8654ed46 100644 --- a/src/components/DisplayCurrency.tsx +++ b/src/components/common/DisplayCurrency.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { useMemo } from 'react' -import { FormattedNumber } from 'components/FormattedNumber' +import { FormattedNumber } from 'components/common/FormattedNumber' import { ORACLE_DENOM } from 'constants/oracle' import useAllAssets from 'hooks/assets/useAllAssets' import useDisplayCurrencyAssets from 'hooks/assets/useDisplayCurrencyAssets' diff --git a/src/components/Divider.tsx b/src/components/common/Divider.tsx similarity index 100% rename from src/components/Divider.tsx rename to src/components/common/Divider.tsx diff --git a/src/components/DocsLink.tsx b/src/components/common/DocsLink.tsx similarity index 88% rename from src/components/DocsLink.tsx rename to src/components/common/DocsLink.tsx index e7ac87ec..3122e8ef 100644 --- a/src/components/DocsLink.tsx +++ b/src/components/common/DocsLink.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' -import { ExternalLink } from 'components/Icons' -import Text from 'components/Text' -import { TextLink } from 'components/TextLink' +import { ExternalLink } from 'components/common/Icons' +import Text from 'components/common/Text' +import { TextLink } from 'components/common/TextLink' import { DocURL } from 'types/enums/docURL' interface Props { diff --git a/src/components/DoubleLogo.tsx b/src/components/common/DoubleLogo.tsx similarity index 91% rename from src/components/DoubleLogo.tsx rename to src/components/common/DoubleLogo.tsx index 41628b37..577c6566 100644 --- a/src/components/DoubleLogo.tsx +++ b/src/components/common/DoubleLogo.tsx @@ -1,4 +1,4 @@ -import AssetImage from 'components/Asset/AssetImage' +import AssetImage from 'components/common/assets/AssetImage' import useAsset from 'hooks/assets/useAsset' interface Props { diff --git a/src/components/Footer.tsx b/src/components/common/Footer.tsx similarity index 86% rename from src/components/Footer.tsx rename to src/components/common/Footer.tsx index a885838f..babd3af8 100644 --- a/src/components/Footer.tsx +++ b/src/components/common/Footer.tsx @@ -1,7 +1,7 @@ -import { TextLink } from 'components/TextLink' +import { TextLink } from 'components/common/TextLink' import { DocURL } from 'types/enums/docURL' -import packageInfo from '../../package.json' +import packageInfo from '../../../package.json' export default function Footer() { const version = `v${packageInfo.version}` diff --git a/src/components/FormattedNumber.tsx b/src/components/common/FormattedNumber.tsx similarity index 100% rename from src/components/FormattedNumber.tsx rename to src/components/common/FormattedNumber.tsx diff --git a/src/components/FullOverlayContent.tsx b/src/components/common/FullOverlayContent.tsx similarity index 86% rename from src/components/FullOverlayContent.tsx rename to src/components/common/FullOverlayContent.tsx index 9f56263e..5fbd990f 100644 --- a/src/components/FullOverlayContent.tsx +++ b/src/components/common/FullOverlayContent.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' -import Button from 'components/Button' -import DocsLink from 'components/DocsLink' -import Text from 'components/Text' +import Button from 'components/common/Button' +import DocsLink from 'components/common/DocsLink' +import Text from 'components/common/Text' interface Props { title: string diff --git a/src/components/Gauge.tsx b/src/components/common/Gauge.tsx similarity index 98% rename from src/components/Gauge.tsx rename to src/components/common/Gauge.tsx index 2f76aef2..b9b035c6 100644 --- a/src/components/Gauge.tsx +++ b/src/components/common/Gauge.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { ReactElement, ReactNode } from 'react' -import { Tooltip } from 'components/Tooltip' +import { Tooltip } from 'components/common/Tooltip' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Icons/Account.svg b/src/components/common/Icons/Account.svg similarity index 100% rename from src/components/Icons/Account.svg rename to src/components/common/Icons/Account.svg diff --git a/src/components/Icons/AccountArrowDown.svg b/src/components/common/Icons/AccountArrowDown.svg similarity index 100% rename from src/components/Icons/AccountArrowDown.svg rename to src/components/common/Icons/AccountArrowDown.svg diff --git a/src/components/Icons/ArrowChartLineUp.svg b/src/components/common/Icons/ArrowChartLineUp.svg similarity index 100% rename from src/components/Icons/ArrowChartLineUp.svg rename to src/components/common/Icons/ArrowChartLineUp.svg diff --git a/src/components/Icons/ArrowCircle.svg b/src/components/common/Icons/ArrowCircle.svg similarity index 100% rename from src/components/Icons/ArrowCircle.svg rename to src/components/common/Icons/ArrowCircle.svg diff --git a/src/components/Icons/ArrowCircledTopRight.svg b/src/components/common/Icons/ArrowCircledTopRight.svg similarity index 100% rename from src/components/Icons/ArrowCircledTopRight.svg rename to src/components/common/Icons/ArrowCircledTopRight.svg diff --git a/src/components/Icons/ArrowDownLine.svg b/src/components/common/Icons/ArrowDownLine.svg similarity index 100% rename from src/components/Icons/ArrowDownLine.svg rename to src/components/common/Icons/ArrowDownLine.svg diff --git a/src/components/Icons/ArrowRight.svg b/src/components/common/Icons/ArrowRight.svg similarity index 100% rename from src/components/Icons/ArrowRight.svg rename to src/components/common/Icons/ArrowRight.svg diff --git a/src/components/Icons/ArrowUpLine.svg b/src/components/common/Icons/ArrowUpLine.svg similarity index 100% rename from src/components/Icons/ArrowUpLine.svg rename to src/components/common/Icons/ArrowUpLine.svg diff --git a/src/components/Icons/Chain.svg b/src/components/common/Icons/Chain.svg similarity index 100% rename from src/components/Icons/Chain.svg rename to src/components/common/Icons/Chain.svg diff --git a/src/components/Icons/Check.svg b/src/components/common/Icons/Check.svg similarity index 100% rename from src/components/Icons/Check.svg rename to src/components/common/Icons/Check.svg diff --git a/src/components/Icons/CheckCircled.svg b/src/components/common/Icons/CheckCircled.svg similarity index 100% rename from src/components/Icons/CheckCircled.svg rename to src/components/common/Icons/CheckCircled.svg diff --git a/src/components/Icons/ChevronDown.svg b/src/components/common/Icons/ChevronDown.svg similarity index 100% rename from src/components/Icons/ChevronDown.svg rename to src/components/common/Icons/ChevronDown.svg diff --git a/src/components/Icons/ChevronLeft.svg b/src/components/common/Icons/ChevronLeft.svg similarity index 100% rename from src/components/Icons/ChevronLeft.svg rename to src/components/common/Icons/ChevronLeft.svg diff --git a/src/components/Icons/ChevronRight.svg b/src/components/common/Icons/ChevronRight.svg similarity index 100% rename from src/components/Icons/ChevronRight.svg rename to src/components/common/Icons/ChevronRight.svg diff --git a/src/components/Icons/ChevronUp.svg b/src/components/common/Icons/ChevronUp.svg similarity index 100% rename from src/components/Icons/ChevronUp.svg rename to src/components/common/Icons/ChevronUp.svg diff --git a/src/components/Icons/Circle.svg b/src/components/common/Icons/Circle.svg similarity index 100% rename from src/components/Icons/Circle.svg rename to src/components/common/Icons/Circle.svg diff --git a/src/components/Icons/Coins.svg b/src/components/common/Icons/Coins.svg similarity index 100% rename from src/components/Icons/Coins.svg rename to src/components/common/Icons/Coins.svg diff --git a/src/components/Icons/CoinsSwap.svg b/src/components/common/Icons/CoinsSwap.svg similarity index 100% rename from src/components/Icons/CoinsSwap.svg rename to src/components/common/Icons/CoinsSwap.svg diff --git a/src/components/Icons/Compass.svg b/src/components/common/Icons/Compass.svg similarity index 100% rename from src/components/Icons/Compass.svg rename to src/components/common/Icons/Compass.svg diff --git a/src/components/Icons/Copy.svg b/src/components/common/Icons/Copy.svg similarity index 100% rename from src/components/Icons/Copy.svg rename to src/components/common/Icons/Copy.svg diff --git a/src/components/Icons/Cross.svg b/src/components/common/Icons/Cross.svg similarity index 100% rename from src/components/Icons/Cross.svg rename to src/components/common/Icons/Cross.svg diff --git a/src/components/Icons/CrossCircled.svg b/src/components/common/Icons/CrossCircled.svg similarity index 100% rename from src/components/Icons/CrossCircled.svg rename to src/components/common/Icons/CrossCircled.svg diff --git a/src/components/Icons/Edit.svg b/src/components/common/Icons/Edit.svg similarity index 100% rename from src/components/Icons/Edit.svg rename to src/components/common/Icons/Edit.svg diff --git a/src/components/Icons/Enter.svg b/src/components/common/Icons/Enter.svg similarity index 100% rename from src/components/Icons/Enter.svg rename to src/components/common/Icons/Enter.svg diff --git a/src/components/Icons/ExclamationMarkCircled.svg b/src/components/common/Icons/ExclamationMarkCircled.svg similarity index 100% rename from src/components/Icons/ExclamationMarkCircled.svg rename to src/components/common/Icons/ExclamationMarkCircled.svg diff --git a/src/components/Icons/ExclamationMarkTriangle.svg b/src/components/common/Icons/ExclamationMarkTriangle.svg similarity index 100% rename from src/components/Icons/ExclamationMarkTriangle.svg rename to src/components/common/Icons/ExclamationMarkTriangle.svg diff --git a/src/components/Icons/ExternalLink.svg b/src/components/common/Icons/ExternalLink.svg similarity index 100% rename from src/components/Icons/ExternalLink.svg rename to src/components/common/Icons/ExternalLink.svg diff --git a/src/components/Icons/Flag.svg b/src/components/common/Icons/Flag.svg similarity index 100% rename from src/components/Icons/Flag.svg rename to src/components/common/Icons/Flag.svg diff --git a/src/components/Icons/Gear.svg b/src/components/common/Icons/Gear.svg similarity index 100% rename from src/components/Icons/Gear.svg rename to src/components/common/Icons/Gear.svg diff --git a/src/components/Icons/GridGlobe.svg b/src/components/common/Icons/GridGlobe.svg similarity index 100% rename from src/components/Icons/GridGlobe.svg rename to src/components/common/Icons/GridGlobe.svg diff --git a/src/components/Icons/GridHole.svg b/src/components/common/Icons/GridHole.svg similarity index 100% rename from src/components/Icons/GridHole.svg rename to src/components/common/Icons/GridHole.svg diff --git a/src/components/Icons/GridLandscape.svg b/src/components/common/Icons/GridLandscape.svg similarity index 100% rename from src/components/Icons/GridLandscape.svg rename to src/components/common/Icons/GridLandscape.svg diff --git a/src/components/Icons/GridPlanet.svg b/src/components/common/Icons/GridPlanet.svg similarity index 100% rename from src/components/Icons/GridPlanet.svg rename to src/components/common/Icons/GridPlanet.svg diff --git a/src/components/Icons/GridTire.svg b/src/components/common/Icons/GridTire.svg similarity index 100% rename from src/components/Icons/GridTire.svg rename to src/components/common/Icons/GridTire.svg diff --git a/src/components/Icons/GridWeb.svg b/src/components/common/Icons/GridWeb.svg similarity index 100% rename from src/components/Icons/GridWeb.svg rename to src/components/common/Icons/GridWeb.svg diff --git a/src/components/Icons/HandCoins.svg b/src/components/common/Icons/HandCoins.svg similarity index 100% rename from src/components/Icons/HandCoins.svg rename to src/components/common/Icons/HandCoins.svg diff --git a/src/components/Icons/Heart.svg b/src/components/common/Icons/Heart.svg similarity index 100% rename from src/components/Icons/Heart.svg rename to src/components/common/Icons/Heart.svg diff --git a/src/components/Icons/InfoCircle.svg b/src/components/common/Icons/InfoCircle.svg similarity index 100% rename from src/components/Icons/InfoCircle.svg rename to src/components/common/Icons/InfoCircle.svg diff --git a/src/components/Icons/LockLocked.svg b/src/components/common/Icons/LockLocked.svg similarity index 100% rename from src/components/Icons/LockLocked.svg rename to src/components/common/Icons/LockLocked.svg diff --git a/src/components/Icons/LockUnlocked.svg b/src/components/common/Icons/LockUnlocked.svg similarity index 100% rename from src/components/Icons/LockUnlocked.svg rename to src/components/common/Icons/LockUnlocked.svg diff --git a/src/components/Icons/Logo.svg b/src/components/common/Icons/Logo.svg similarity index 100% rename from src/components/Icons/Logo.svg rename to src/components/common/Icons/Logo.svg diff --git a/src/components/Icons/Luggage.svg b/src/components/common/Icons/Luggage.svg similarity index 100% rename from src/components/Icons/Luggage.svg rename to src/components/common/Icons/Luggage.svg diff --git a/src/components/Icons/MarsProtocol.svg b/src/components/common/Icons/MarsProtocol.svg similarity index 100% rename from src/components/Icons/MarsProtocol.svg rename to src/components/common/Icons/MarsProtocol.svg diff --git a/src/components/Icons/Neutron.svg b/src/components/common/Icons/Neutron.svg similarity index 100% rename from src/components/Icons/Neutron.svg rename to src/components/common/Icons/Neutron.svg diff --git a/src/components/Icons/Osmo.svg b/src/components/common/Icons/Osmo.svg similarity index 100% rename from src/components/Icons/Osmo.svg rename to src/components/common/Icons/Osmo.svg diff --git a/src/components/Icons/OverlayMark.svg b/src/components/common/Icons/OverlayMark.svg similarity index 100% rename from src/components/Icons/OverlayMark.svg rename to src/components/common/Icons/OverlayMark.svg diff --git a/src/components/Icons/Plus.svg b/src/components/common/Icons/Plus.svg similarity index 100% rename from src/components/Icons/Plus.svg rename to src/components/common/Icons/Plus.svg diff --git a/src/components/Icons/PlusCircled.svg b/src/components/common/Icons/PlusCircled.svg similarity index 100% rename from src/components/Icons/PlusCircled.svg rename to src/components/common/Icons/PlusCircled.svg diff --git a/src/components/Icons/PlusSquared.svg b/src/components/common/Icons/PlusSquared.svg similarity index 100% rename from src/components/Icons/PlusSquared.svg rename to src/components/common/Icons/PlusSquared.svg diff --git a/src/components/Icons/PythLogoType.svg b/src/components/common/Icons/PythLogoType.svg similarity index 100% rename from src/components/Icons/PythLogoType.svg rename to src/components/common/Icons/PythLogoType.svg diff --git a/src/components/Icons/Questionmark.svg b/src/components/common/Icons/Questionmark.svg similarity index 100% rename from src/components/Icons/Questionmark.svg rename to src/components/common/Icons/Questionmark.svg diff --git a/src/components/Icons/ReceiptCheck.svg b/src/components/common/Icons/ReceiptCheck.svg similarity index 100% rename from src/components/Icons/ReceiptCheck.svg rename to src/components/common/Icons/ReceiptCheck.svg diff --git a/src/components/Icons/Scale.svg b/src/components/common/Icons/Scale.svg similarity index 100% rename from src/components/Icons/Scale.svg rename to src/components/common/Icons/Scale.svg diff --git a/src/components/Icons/Search.svg b/src/components/common/Icons/Search.svg similarity index 100% rename from src/components/Icons/Search.svg rename to src/components/common/Icons/Search.svg diff --git a/src/components/Icons/Shield.svg b/src/components/common/Icons/Shield.svg similarity index 100% rename from src/components/Icons/Shield.svg rename to src/components/common/Icons/Shield.svg diff --git a/src/components/Icons/SortAsc.svg b/src/components/common/Icons/SortAsc.svg similarity index 100% rename from src/components/Icons/SortAsc.svg rename to src/components/common/Icons/SortAsc.svg diff --git a/src/components/Icons/SortDesc.svg b/src/components/common/Icons/SortDesc.svg similarity index 100% rename from src/components/Icons/SortDesc.svg rename to src/components/common/Icons/SortDesc.svg diff --git a/src/components/Icons/SortNone.svg b/src/components/common/Icons/SortNone.svg similarity index 100% rename from src/components/Icons/SortNone.svg rename to src/components/common/Icons/SortNone.svg diff --git a/src/components/Icons/StarFilled.svg b/src/components/common/Icons/StarFilled.svg similarity index 100% rename from src/components/Icons/StarFilled.svg rename to src/components/common/Icons/StarFilled.svg diff --git a/src/components/Icons/StarOutlined.svg b/src/components/common/Icons/StarOutlined.svg similarity index 100% rename from src/components/Icons/StarOutlined.svg rename to src/components/common/Icons/StarOutlined.svg diff --git a/src/components/Icons/Subtract.svg b/src/components/common/Icons/Subtract.svg similarity index 100% rename from src/components/Icons/Subtract.svg rename to src/components/common/Icons/Subtract.svg diff --git a/src/components/Icons/SwapIcon.svg b/src/components/common/Icons/SwapIcon.svg similarity index 100% rename from src/components/Icons/SwapIcon.svg rename to src/components/common/Icons/SwapIcon.svg diff --git a/src/components/Icons/ThreeDots.svg b/src/components/common/Icons/ThreeDots.svg similarity index 100% rename from src/components/Icons/ThreeDots.svg rename to src/components/common/Icons/ThreeDots.svg diff --git a/src/components/Icons/TooltipArrow.svg b/src/components/common/Icons/TooltipArrow.svg similarity index 100% rename from src/components/Icons/TooltipArrow.svg rename to src/components/common/Icons/TooltipArrow.svg diff --git a/src/components/Icons/TrashBin.svg b/src/components/common/Icons/TrashBin.svg similarity index 100% rename from src/components/Icons/TrashBin.svg rename to src/components/common/Icons/TrashBin.svg diff --git a/src/components/Icons/Twitter.svg b/src/components/common/Icons/Twitter.svg similarity index 100% rename from src/components/Icons/Twitter.svg rename to src/components/common/Icons/Twitter.svg diff --git a/src/components/Icons/VerticalThreeLine.svg b/src/components/common/Icons/VerticalThreeLine.svg similarity index 100% rename from src/components/Icons/VerticalThreeLine.svg rename to src/components/common/Icons/VerticalThreeLine.svg diff --git a/src/components/Icons/Wallet.svg b/src/components/common/Icons/Wallet.svg similarity index 100% rename from src/components/Icons/Wallet.svg rename to src/components/common/Icons/Wallet.svg diff --git a/src/components/common/Icons/index.ts b/src/components/common/Icons/index.ts new file mode 100644 index 00000000..48da3587 --- /dev/null +++ b/src/components/common/Icons/index.ts @@ -0,0 +1,70 @@ +// @index(['./*.svg'], f => `export { default as ${f.name} } from 'components/Icons/${f.name}.svg'`) +export { default as Account } from 'components/common/Icons/Account.svg' +export { default as AccountArrowDown } from 'components/common/Icons/AccountArrowDown.svg' +export { default as ArrowChartLineUp } from 'components/common/Icons/ArrowChartLineUp.svg' +export { default as ArrowCircle } from 'components/common/Icons/ArrowCircle.svg' +export { default as ArrowCircledTopRight } from 'components/common/Icons/ArrowCircledTopRight.svg' +export { default as ArrowDownLine } from 'components/common/Icons/ArrowDownLine.svg' +export { default as ArrowRight } from 'components/common/Icons/ArrowRight.svg' +export { default as ArrowUpLine } from 'components/common/Icons/ArrowUpLine.svg' +export { default as Chain } from 'components/common/Icons/Chain.svg' +export { default as Check } from 'components/common/Icons/Check.svg' +export { default as CheckCircled } from 'components/common/Icons/CheckCircled.svg' +export { default as ChevronDown } from 'components/common/Icons/ChevronDown.svg' +export { default as ChevronLeft } from 'components/common/Icons/ChevronLeft.svg' +export { default as ChevronRight } from 'components/common/Icons/ChevronRight.svg' +export { default as ChevronUp } from 'components/common/Icons/ChevronUp.svg' +export { default as Circle } from 'components/common/Icons/Circle.svg' +export { default as Coins } from 'components/common/Icons/Coins.svg' +export { default as CoinsSwap } from 'components/common/Icons/CoinsSwap.svg' +export { default as Compass } from 'components/common/Icons/Compass.svg' +export { default as Copy } from 'components/common/Icons/Copy.svg' +export { default as Cross } from 'components/common/Icons/Cross.svg' +export { default as CrossCircled } from 'components/common/Icons/CrossCircled.svg' +export { default as Edit } from 'components/common/Icons/Edit.svg' +export { default as Enter } from 'components/common/Icons/Enter.svg' +export { default as ExclamationMarkCircled } from 'components/common/Icons/ExclamationMarkCircled.svg' +export { default as ExclamationMarkTriangle } from 'components/common/Icons/ExclamationMarkTriangle.svg' +export { default as ExternalLink } from 'components/common/Icons/ExternalLink.svg' +export { default as Flag } from 'components/common/Icons/Flag.svg' +export { default as Gear } from 'components/common/Icons/Gear.svg' +export { default as GridGlobe } from 'components/common/Icons/GridGlobe.svg' +export { default as GridHole } from 'components/common/Icons/GridHole.svg' +export { default as GridLandscape } from 'components/common/Icons/GridLandscape.svg' +export { default as GridPlanet } from 'components/common/Icons/GridPlanet.svg' +export { default as GridTire } from 'components/common/Icons/GridTire.svg' +export { default as GridWeb } from 'components/common/Icons/GridWeb.svg' +export { default as HandCoins } from 'components/common/Icons/HandCoins.svg' +export { default as Heart } from 'components/common/Icons/Heart.svg' +export { default as InfoCircle } from 'components/common/Icons/InfoCircle.svg' +export { default as LockLocked } from 'components/common/Icons/LockLocked.svg' +export { default as LockUnlocked } from 'components/common/Icons/LockUnlocked.svg' +export { default as Logo } from 'components/common/Icons/Logo.svg' +export { default as Luggage } from 'components/common/Icons/Luggage.svg' +export { default as MarsProtocol } from 'components/common/Icons/MarsProtocol.svg' +export { default as Neutron } from 'components/common/Icons/Neutron.svg' +export { default as Osmo } from 'components/common/Icons/Osmo.svg' +export { default as OverlayMark } from 'components/common/Icons/OverlayMark.svg' +export { default as Plus } from 'components/common/Icons/Plus.svg' +export { default as PlusCircled } from 'components/common/Icons/PlusCircled.svg' +export { default as PlusSquared } from 'components/common/Icons/PlusSquared.svg' +export { default as PythLogoType } from 'components/common/Icons/PythLogoType.svg' +export { default as Questionmark } from 'components/common/Icons/Questionmark.svg' +export { default as ReceiptCheck } from 'components/common/Icons/ReceiptCheck.svg' +export { default as Scale } from 'components/common/Icons/Scale.svg' +export { default as Search } from 'components/common/Icons/Search.svg' +export { default as Shield } from 'components/common/Icons/Shield.svg' +export { default as SortAsc } from 'components/common/Icons/SortAsc.svg' +export { default as SortDesc } from 'components/common/Icons/SortDesc.svg' +export { default as SortNone } from 'components/common/Icons/SortNone.svg' +export { default as StarFilled } from 'components/common/Icons/StarFilled.svg' +export { default as StarOutlined } from 'components/common/Icons/StarOutlined.svg' +export { default as Subtract } from 'components/common/Icons/Subtract.svg' +export { default as SwapIcon } from 'components/common/Icons/SwapIcon.svg' +export { default as ThreeDots } from 'components/common/Icons/ThreeDots.svg' +export { default as TooltipArrow } from 'components/common/Icons/TooltipArrow.svg' +export { default as TrashBin } from 'components/common/Icons/TrashBin.svg' +export { default as Twitter } from 'components/common/Icons/Twitter.svg' +export { default as VerticalThreeLine } from 'components/common/Icons/VerticalThreeLine.svg' +export { default as Wallet } from 'components/common/Icons/Wallet.svg' +// @endindex diff --git a/src/components/Intro.tsx b/src/components/common/Intro.tsx similarity index 87% rename from src/components/Intro.tsx rename to src/components/common/Intro.tsx index 9b38b6de..b4dff3c1 100644 --- a/src/components/Intro.tsx +++ b/src/components/common/Intro.tsx @@ -1,10 +1,17 @@ import classNames from 'classnames' import { ReactNode } from 'react' -import Card from 'components/Card' -import { GridGlobe, GridHole, GridLandscape, GridPlanet, GridTire, GridWeb } from 'components/Icons' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Card from 'components/common/Card' +import { + GridGlobe, + GridHole, + GridLandscape, + GridPlanet, + GridTire, + GridWeb, +} from 'components/common/Icons' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import useStore from 'store' interface Props { diff --git a/src/components/LabelValuePair.tsx b/src/components/common/LabelValuePair.tsx similarity index 86% rename from src/components/LabelValuePair.tsx rename to src/components/common/LabelValuePair.tsx index 70bde7a6..9a2bcbba 100644 --- a/src/components/LabelValuePair.tsx +++ b/src/components/common/LabelValuePair.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' import { BN } from 'utils/helpers' interface ValueData extends FormattedNumberProps { diff --git a/src/components/RangeInput/InputOverlay.tsx b/src/components/common/LeverageSlider/InputOverlay.tsx similarity index 57% rename from src/components/RangeInput/InputOverlay.tsx rename to src/components/common/LeverageSlider/InputOverlay.tsx index f68cce2c..9ecb254f 100644 --- a/src/components/RangeInput/InputOverlay.tsx +++ b/src/components/common/LeverageSlider/InputOverlay.tsx @@ -1,17 +1,19 @@ import classNames from 'classnames' -import { VerticalThreeLine } from 'components/Icons' +import { VerticalThreeLine } from 'components/common/Icons' +import { LeverageSliderType } from 'components/common/LeverageSlider' import { formatValue } from 'utils/formatters' interface Props { value: number marginThreshold?: number max: number + type: LeverageSliderType } const THUMB_WIDTH = 33 -function InputOverlay({ max, value, marginThreshold }: Props) { +function InputOverlay({ max, value, marginThreshold, type }: Props) { const thumbPosPercent = max === 0 ? 0 : 100 / (max / value) const thumbPadRight = (thumbPosPercent / 100) * THUMB_WIDTH const markPosPercent = 100 / (max / (marginThreshold ?? 1)) @@ -21,12 +23,16 @@ function InputOverlay({ max, value, marginThreshold }: Props) { return ( <>
{Array.from(Array(9).keys()).map((i) => (
@@ -47,14 +53,21 @@ function InputOverlay({ max, value, marginThreshold }: Props) {
- {formatValue(value, { maxDecimals: 2, abbreviated: true, rounded: true })} + {formatValue(value, { + maxDecimals: 2, + abbreviated: true, + rounded: true, + suffix: type !== 'margin' ? 'x' : '', + })}
) diff --git a/src/components/RangeInput/index.tsx b/src/components/common/LeverageSlider/index.tsx similarity index 87% rename from src/components/RangeInput/index.tsx rename to src/components/common/LeverageSlider/index.tsx index b5872152..e3d8af8b 100644 --- a/src/components/RangeInput/index.tsx +++ b/src/components/common/LeverageSlider/index.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { ChangeEvent, useCallback } from 'react' -import InputOverlay from 'components/RangeInput/InputOverlay' +import InputOverlay from 'components/common/LeverageSlider/InputOverlay' const LEFT_MARGIN = 5 @@ -13,10 +13,12 @@ type Props = { wrapperClassName?: string onChange: (value: number) => void onBlur?: () => void + type: LeverageSliderType } -function RangeInput(props: Props) { - const { value, max, onChange, wrapperClassName, disabled, marginThreshold, onBlur } = props +export type LeverageSliderType = 'margin' | 'long' | 'short' +function LeverageSlider(props: Props) { + const { value, max, onChange, wrapperClassName, disabled, marginThreshold, onBlur, type } = props const handleOnChange = useCallback( (event: ChangeEvent) => { @@ -52,7 +54,7 @@ function RangeInput(props: Props) { onChange={handleOnChange} onBlur={onBlur} /> - +
{markPosPercent > LEFT_MARGIN ? 0 : ''} @@ -62,4 +64,4 @@ function RangeInput(props: Props) { ) } -export default RangeInput +export default LeverageSlider diff --git a/src/components/Loading.tsx b/src/components/common/Loading.tsx similarity index 100% rename from src/components/Loading.tsx rename to src/components/common/Loading.tsx diff --git a/src/components/MarketDetails.tsx b/src/components/common/MarketDetails.tsx similarity index 96% rename from src/components/MarketDetails.tsx rename to src/components/common/MarketDetails.tsx index 0fb17a5c..269e2a70 100644 --- a/src/components/MarketDetails.tsx +++ b/src/components/common/MarketDetails.tsx @@ -1,8 +1,8 @@ import { Row } from '@tanstack/react-table' import { useMemo } from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import TitleAndSubCell from 'components/TitleAndSubCell' +import { FormattedNumber } from 'components/common/FormattedNumber' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import useDisplayCurrencyPrice from 'hooks/useDisplayCurrencyPrice' interface Props { diff --git a/src/components/MigrationBanner.tsx b/src/components/common/MigrationBanner.tsx similarity index 87% rename from src/components/MigrationBanner.tsx rename to src/components/common/MigrationBanner.tsx index e23f0784..65ca6205 100644 --- a/src/components/MigrationBanner.tsx +++ b/src/components/common/MigrationBanner.tsx @@ -1,7 +1,7 @@ -import Card from 'components/Card' -import { Cross, ExclamationMarkCircled } from 'components/Icons' -import Text from 'components/Text' -import { TextLink } from 'components/TextLink' +import Card from 'components/common/Card' +import { Cross, ExclamationMarkCircled } from 'components/common/Icons' +import Text from 'components/common/Text' +import { TextLink } from 'components/common/TextLink' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/MobileNotSupported.tsx b/src/components/common/MobileNotSupported.tsx similarity index 92% rename from src/components/MobileNotSupported.tsx rename to src/components/common/MobileNotSupported.tsx index 4f242aed..b2c9dcae 100644 --- a/src/components/MobileNotSupported.tsx +++ b/src/components/common/MobileNotSupported.tsx @@ -1,7 +1,7 @@ import Spline from '@splinetool/react-spline' -import Button from 'components/Button' -import Text from 'components/Text' +import Button from 'components/common/Button' +import Text from 'components/common/Text' import { DocURL } from 'types/enums/docURL' export default function MobileNotSupported() { diff --git a/src/components/NotificationBanner.tsx b/src/components/common/NotificationBanner.tsx similarity index 95% rename from src/components/NotificationBanner.tsx rename to src/components/common/NotificationBanner.tsx index 62873eda..03223abc 100644 --- a/src/components/NotificationBanner.tsx +++ b/src/components/common/NotificationBanner.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import { useMemo } from 'react' -import { CheckCircled, CrossCircled, ExclamationMarkTriangle } from 'components/Icons' -import Text from 'components/Text' +import { CheckCircled, CrossCircled, ExclamationMarkTriangle } from 'components/common/Icons' +import Text from 'components/common/Text' interface Props { type: 'success' | 'error' | 'warning' | 'info' diff --git a/src/components/NumberInput.tsx b/src/components/common/NumberInput.tsx similarity index 100% rename from src/components/NumberInput.tsx rename to src/components/common/NumberInput.tsx diff --git a/src/components/Overlay.tsx b/src/components/common/Overlay.tsx similarity index 100% rename from src/components/Overlay.tsx rename to src/components/common/Overlay.tsx diff --git a/src/components/PageMetadata.tsx b/src/components/common/PageMetadata.tsx similarity index 100% rename from src/components/PageMetadata.tsx rename to src/components/common/PageMetadata.tsx diff --git a/src/components/ProgressBar.tsx b/src/components/common/ProgressBar.tsx similarity index 100% rename from src/components/ProgressBar.tsx rename to src/components/common/ProgressBar.tsx diff --git a/src/components/Radio.tsx b/src/components/common/Radio.tsx similarity index 100% rename from src/components/Radio.tsx rename to src/components/common/Radio.tsx diff --git a/src/components/SearchBar.tsx b/src/components/common/SearchBar.tsx similarity index 95% rename from src/components/SearchBar.tsx rename to src/components/common/SearchBar.tsx index 6d0e430c..b8e74b5a 100644 --- a/src/components/SearchBar.tsx +++ b/src/components/common/SearchBar.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import React, { ChangeEvent, LegacyRef } from 'react' -import { Search } from 'components/Icons' +import { Search } from 'components/common/Icons' interface Props { value: string diff --git a/src/components/Select/Option.tsx b/src/components/common/Select/Option.tsx similarity index 92% rename from src/components/Select/Option.tsx rename to src/components/common/Select/Option.tsx index 556735cc..89fe8e25 100644 --- a/src/components/Select/Option.tsx +++ b/src/components/common/Select/Option.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' -import AssetImage from 'components/Asset/AssetImage' -import AssetRate from 'components/Asset/AssetRate' -import DisplayCurrency from 'components/DisplayCurrency' -import { ChevronDown, ChevronRight } from 'components/Icons' -import Text from 'components/Text' +import AssetImage from 'components/common/assets/AssetImage' +import AssetRate from 'components/common/assets/AssetRate' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { ChevronDown, ChevronRight } from 'components/common/Icons' +import Text from 'components/common/Text' import { BN_ZERO } from 'constants/math' import useAsset from 'hooks/assets/useAsset' import useMarketAssets from 'hooks/markets/useMarketAssets' diff --git a/src/components/Select/index.tsx b/src/components/common/Select/index.tsx similarity index 95% rename from src/components/Select/index.tsx rename to src/components/common/Select/index.tsx index 1cd90599..762ebb8c 100644 --- a/src/components/Select/index.tsx +++ b/src/components/common/Select/index.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' import { useEffect, useState } from 'react' -import { ChevronDown } from 'components/Icons' -import Overlay from 'components/Overlay' -import Option from 'components/Select/Option' -import Text from 'components/Text' +import { ChevronDown } from 'components/common/Icons' +import Overlay from 'components/common/Overlay' +import Option from 'components/common/Select/Option' +import Text from 'components/common/Text' import useToggle from 'hooks/useToggle' interface Props { diff --git a/src/components/Settings.tsx b/src/components/common/Settings.tsx similarity index 73% rename from src/components/Settings.tsx rename to src/components/common/Settings.tsx index e02fdbe1..403fe1b0 100644 --- a/src/components/Settings.tsx +++ b/src/components/common/Settings.tsx @@ -1,5 +1,5 @@ -import Button from 'components/Button' -import { Gear } from 'components/Icons' +import Button from 'components/common/Button' +import { Gear } from 'components/common/Icons' import useStore from 'store' export default function Settings() { diff --git a/src/components/ShareBar.tsx b/src/components/common/ShareBar.tsx similarity index 87% rename from src/components/ShareBar.tsx rename to src/components/common/ShareBar.tsx index 9cea8d2e..e0f84443 100644 --- a/src/components/ShareBar.tsx +++ b/src/components/common/ShareBar.tsx @@ -2,10 +2,10 @@ import classNames from 'classnames' import { useLocation, useParams } from 'react-router-dom' import useClipboard from 'react-use-clipboard' -import Button from 'components/Button' -import { Chain, Check, Twitter } from 'components/Icons' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Button from 'components/common/Button' +import { Chain, Check, Twitter } from 'components/common/Icons' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import ConditionalWrapper from 'hocs/ConditionalWrapper' import { DocURL } from 'types/enums/docURL' diff --git a/src/components/Slider/LeverageLabel.tsx b/src/components/common/Slider/LeverageLabel.tsx similarity index 93% rename from src/components/Slider/LeverageLabel.tsx rename to src/components/common/Slider/LeverageLabel.tsx index 3611429f..d2e1c3a7 100644 --- a/src/components/Slider/LeverageLabel.tsx +++ b/src/components/common/Slider/LeverageLabel.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames' -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { className?: string diff --git a/src/components/Slider/Mark.tsx b/src/components/common/Slider/Mark.tsx similarity index 100% rename from src/components/Slider/Mark.tsx rename to src/components/common/Slider/Mark.tsx diff --git a/src/components/Slider/Track.tsx b/src/components/common/Slider/Track.tsx similarity index 100% rename from src/components/Slider/Track.tsx rename to src/components/common/Slider/Track.tsx diff --git a/src/components/Slider/index.tsx b/src/components/common/Slider/index.tsx similarity index 96% rename from src/components/Slider/index.tsx rename to src/components/common/Slider/index.tsx index 047d8e19..eafb45a1 100644 --- a/src/components/Slider/index.tsx +++ b/src/components/common/Slider/index.tsx @@ -2,10 +2,10 @@ import classNames from 'classnames' import { ChangeEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react' import Draggable from 'react-draggable' -import { OverlayMark } from 'components/Icons' -import LeverageLabel from 'components/Slider/LeverageLabel' -import Mark from 'components/Slider/Mark' -import Track from 'components/Slider/Track' +import { OverlayMark } from 'components/common/Icons' +import LeverageLabel from 'components/common/Slider/LeverageLabel' +import Mark from 'components/common/Slider/Mark' +import Track from 'components/common/Slider/Track' import useToggle from 'hooks/useToggle' const colors = { diff --git a/src/components/Spacer.tsx b/src/components/common/Spacer.tsx similarity index 100% rename from src/components/Spacer.tsx rename to src/components/common/Spacer.tsx diff --git a/src/components/SummaryItems.tsx b/src/components/common/SummaryItems.tsx similarity index 82% rename from src/components/SummaryItems.tsx rename to src/components/common/SummaryItems.tsx index f5a66488..b0742161 100644 --- a/src/components/SummaryItems.tsx +++ b/src/components/common/SummaryItems.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' -import WarningMessages from 'components/WarningMessages' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' +import WarningMessages from 'components/common/WarningMessages' interface Props { items: SummaryItem[] diff --git a/src/components/SummaryLine.tsx b/src/components/common/SummaryLine.tsx similarity index 100% rename from src/components/SummaryLine.tsx rename to src/components/common/SummaryLine.tsx diff --git a/src/components/Switch/SwitchAutoLend.tsx b/src/components/common/Switch/SwitchAutoLend.tsx similarity index 95% rename from src/components/Switch/SwitchAutoLend.tsx rename to src/components/common/Switch/SwitchAutoLend.tsx index 6bfc28c0..c53f24b2 100644 --- a/src/components/Switch/SwitchAutoLend.tsx +++ b/src/components/common/Switch/SwitchAutoLend.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { useCallback } from 'react' -import SwitchWithLabel from 'components/Switch/SwitchWithLabel' +import SwitchWithLabel from 'components/common/Switch/SwitchWithLabel' import useEnableAutoLendGlobal from 'hooks/localStorage/useEnableAutoLendGlobal' import useAutoLend from 'hooks/useAutoLend' diff --git a/src/components/Switch/SwitchWithLabel.tsx b/src/components/common/Switch/SwitchWithLabel.tsx similarity index 85% rename from src/components/Switch/SwitchWithLabel.tsx rename to src/components/common/Switch/SwitchWithLabel.tsx index 7ecc216b..63714416 100644 --- a/src/components/Switch/SwitchWithLabel.tsx +++ b/src/components/common/Switch/SwitchWithLabel.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' -import Switch from 'components/Switch' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Switch from 'components/common/Switch/index' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' interface Props { name: string diff --git a/src/components/Switch/index.tsx b/src/components/common/Switch/index.tsx similarity index 100% rename from src/components/Switch/index.tsx rename to src/components/common/Switch/index.tsx diff --git a/src/components/Table/ActionButtonRow.tsx b/src/components/common/Table/ActionButtonRow.tsx similarity index 93% rename from src/components/Table/ActionButtonRow.tsx rename to src/components/common/Table/ActionButtonRow.tsx index 16faf1af..5d791752 100644 --- a/src/components/Table/ActionButtonRow.tsx +++ b/src/components/common/Table/ActionButtonRow.tsx @@ -1,7 +1,7 @@ import { Row as TanstackRow } from '@tanstack/react-table' import { ReactNode } from 'react' -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { row: TanstackRow diff --git a/src/components/Table/Row.tsx b/src/components/common/Table/Row.tsx similarity index 100% rename from src/components/Table/Row.tsx rename to src/components/common/Table/Row.tsx diff --git a/src/components/TableSkeleton.tsx b/src/components/common/Table/TableSkeleton.tsx similarity index 93% rename from src/components/TableSkeleton.tsx rename to src/components/common/Table/TableSkeleton.tsx index 68b27e8f..0dea9670 100644 --- a/src/components/TableSkeleton.tsx +++ b/src/components/common/Table/TableSkeleton.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' -import { SortNone } from 'components/Icons' -import Loading from 'components/Loading' -import Text from 'components/Text' +import { SortNone } from 'components/common/Icons' +import Loading from 'components/common/Loading' +import Text from 'components/common/Text' interface Props { labels: string[] diff --git a/src/components/Table/index.tsx b/src/components/common/Table/index.tsx similarity index 94% rename from src/components/Table/index.tsx rename to src/components/common/Table/index.tsx index dc17f0ea..1e36db57 100644 --- a/src/components/Table/index.tsx +++ b/src/components/common/Table/index.tsx @@ -11,10 +11,10 @@ import { import classNames from 'classnames' import React from 'react' -import Card from 'components/Card' -import { SortAsc, SortDesc, SortNone } from 'components/Icons' -import Row from 'components/Table/Row' -import Text from 'components/Text' +import Card from 'components/common/Card' +import { SortAsc, SortDesc, SortNone } from 'components/common/Icons' +import Row from 'components/common/Table/Row' +import Text from 'components/common/Text' import ConditionalWrapper from 'hocs/ConditionalWrapper' interface Props { diff --git a/src/components/TermsOfService.tsx b/src/components/common/TermsOfService.tsx similarity index 92% rename from src/components/TermsOfService.tsx rename to src/components/common/TermsOfService.tsx index a0bfbd61..0dadc568 100644 --- a/src/components/TermsOfService.tsx +++ b/src/components/common/TermsOfService.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import { useCallback } from 'react' -import FullOverlayContent from 'components/FullOverlayContent' -import { Check } from 'components/Icons' -import Text from 'components/Text' +import FullOverlayContent from 'components/common/FullOverlayContent' +import { Check } from 'components/common/Icons' +import Text from 'components/common/Text' import WalletSelect from 'components/Wallet/WalletSelect' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Text.tsx b/src/components/common/Text.tsx similarity index 100% rename from src/components/Text.tsx rename to src/components/common/Text.tsx diff --git a/src/components/TextLink.tsx b/src/components/common/TextLink.tsx similarity index 100% rename from src/components/TextLink.tsx rename to src/components/common/TextLink.tsx diff --git a/src/components/TitleAndSubCell.tsx b/src/components/common/TitleAndSubCell.tsx similarity index 93% rename from src/components/TitleAndSubCell.tsx rename to src/components/common/TitleAndSubCell.tsx index 638468aa..80ab2fcd 100644 --- a/src/components/TitleAndSubCell.tsx +++ b/src/components/common/TitleAndSubCell.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames' -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { title: string | React.ReactNode diff --git a/src/components/Toaster/index.tsx b/src/components/common/Toaster/index.tsx similarity index 96% rename from src/components/Toaster/index.tsx rename to src/components/common/Toaster/index.tsx index 6ad7ed96..58c27bc5 100644 --- a/src/components/Toaster/index.tsx +++ b/src/components/common/Toaster/index.tsx @@ -3,11 +3,11 @@ import { ReactNode } from 'react' import { Slide, ToastContainer, toast as toastify } from 'react-toastify' import { mutate } from 'swr' -import { CheckMark } from 'components/CheckMark' -import { CircularProgress } from 'components/CircularProgress' -import { ChevronDown, Cross, CrossCircled, ExternalLink } from 'components/Icons' -import Text from 'components/Text' -import { TextLink } from 'components/TextLink' +import { CheckMark } from 'components/common/CheckMark' +import { CircularProgress } from 'components/common/CircularProgress' +import { ChevronDown, Cross, CrossCircled, ExternalLink } from 'components/common/Icons' +import Text from 'components/common/Text' +import { TextLink } from 'components/common/TextLink' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/TokenInput/TokenInputWithSlider.tsx b/src/components/common/TokenInput/TokenInputWithSlider.tsx similarity index 95% rename from src/components/TokenInput/TokenInputWithSlider.tsx rename to src/components/common/TokenInput/TokenInputWithSlider.tsx index 7519597b..ee8b8813 100644 --- a/src/components/TokenInput/TokenInputWithSlider.tsx +++ b/src/components/common/TokenInput/TokenInputWithSlider.tsx @@ -1,8 +1,8 @@ import BigNumber from 'bignumber.js' import { useEffect, useState } from 'react' -import Slider from 'components/Slider' -import TokenInput from 'components/TokenInput' +import Slider from 'components/common/Slider' +import TokenInput from 'components/common/TokenInput/index' import { BN_ZERO } from 'constants/math' import { BNCoin } from 'types/classes/BNCoin' import { BN } from 'utils/helpers' diff --git a/src/components/TokenInput/index.tsx b/src/components/common/TokenInput/index.tsx similarity index 88% rename from src/components/TokenInput/index.tsx rename to src/components/common/TokenInput/index.tsx index 2bca9f88..b88619b3 100644 --- a/src/components/TokenInput/index.tsx +++ b/src/components/common/TokenInput/index.tsx @@ -1,15 +1,15 @@ import BigNumber from 'bignumber.js' import classNames from 'classnames' -import AssetImage from 'components/Asset/AssetImage' -import Button from 'components/Button' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import { TrashBin } from 'components/Icons' -import NumberInput from 'components/NumberInput' -import Select from 'components/Select' -import Text from 'components/Text' -import WarningMessages from 'components/WarningMessages' +import AssetImage from 'components/common/assets/AssetImage' +import Button from 'components/common/Button' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { TrashBin } from 'components/common/Icons' +import NumberInput from 'components/common/NumberInput' +import Select from 'components/common/Select' +import Text from 'components/common/Text' +import WarningMessages from 'components/common/WarningMessages' import useAllAssets from 'hooks/assets/useAllAssets' import useBaseAsset from 'hooks/assets/useBasetAsset' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Tooltip/TooltipContent.tsx b/src/components/common/Tooltip/TooltipContent.tsx similarity index 91% rename from src/components/Tooltip/TooltipContent.tsx rename to src/components/common/Tooltip/TooltipContent.tsx index 22014581..b72af6b9 100644 --- a/src/components/Tooltip/TooltipContent.tsx +++ b/src/components/common/Tooltip/TooltipContent.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import { ReactNode } from 'react' -import { TooltipArrow } from 'components/Icons' -import Text from 'components/Text' +import { TooltipArrow } from 'components/common/Icons' +import Text from 'components/common/Text' interface Props { content: ReactNode | string diff --git a/src/components/Tooltip/index.tsx b/src/components/common/Tooltip/index.tsx similarity index 94% rename from src/components/Tooltip/index.tsx rename to src/components/common/Tooltip/index.tsx index 6edb1a56..c5260681 100644 --- a/src/components/Tooltip/index.tsx +++ b/src/components/common/Tooltip/index.tsx @@ -2,8 +2,8 @@ import Tippy, { TippyProps } from '@tippyjs/react' import classNames from 'classnames' import { ReactNode } from 'react' -import { Questionmark } from 'components/Icons' -import TooltipContent from 'components/Tooltip/TooltipContent' +import { Questionmark } from 'components/common/Icons' +import TooltipContent from 'components/common/Tooltip/TooltipContent' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/TradeDirectionSelector.tsx b/src/components/common/TradeDirectionSelector.tsx similarity index 97% rename from src/components/TradeDirectionSelector.tsx rename to src/components/common/TradeDirectionSelector.tsx index e5f783e4..577515d1 100644 --- a/src/components/TradeDirectionSelector.tsx +++ b/src/components/common/TradeDirectionSelector.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { useMemo } from 'react' -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { direction: TradeDirection diff --git a/src/components/WarningMessages.tsx b/src/components/common/WarningMessages.tsx similarity index 86% rename from src/components/WarningMessages.tsx rename to src/components/common/WarningMessages.tsx index c8923db4..c90920b3 100644 --- a/src/components/WarningMessages.tsx +++ b/src/components/common/WarningMessages.tsx @@ -1,7 +1,7 @@ -import Divider from 'components/Divider' -import { ExclamationMarkTriangle, InfoCircle } from 'components/Icons' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Divider from 'components/common/Divider' +import { ExclamationMarkTriangle, InfoCircle } from 'components/common/Icons' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' interface Props { messages: string[] diff --git a/src/components/Asset/AssetAmount.tsx b/src/components/common/assets/AssetAmount.tsx similarity index 82% rename from src/components/Asset/AssetAmount.tsx rename to src/components/common/assets/AssetAmount.tsx index 12fa75d4..38168c1f 100644 --- a/src/components/Asset/AssetAmount.tsx +++ b/src/components/common/assets/AssetAmount.tsx @@ -1,4 +1,4 @@ -import { FormattedNumber } from 'components/FormattedNumber' +import { FormattedNumber } from 'components/common/FormattedNumber' type Props = { asset: Asset diff --git a/src/components/Asset/AssetBalanceRow.tsx b/src/components/common/assets/AssetBalanceRow.tsx similarity index 79% rename from src/components/Asset/AssetBalanceRow.tsx rename to src/components/common/assets/AssetBalanceRow.tsx index 29a73b3e..5d2554af 100644 --- a/src/components/Asset/AssetBalanceRow.tsx +++ b/src/components/common/assets/AssetBalanceRow.tsx @@ -1,7 +1,7 @@ -import AssetImage from 'components/Asset/AssetImage' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' +import AssetImage from 'components/common/assets/AssetImage' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' import { BNCoin } from 'types/classes/BNCoin' import { demagnify } from 'utils/formatters' diff --git a/src/components/Asset/AssetImage.tsx b/src/components/common/assets/AssetImage.tsx similarity index 100% rename from src/components/Asset/AssetImage.tsx rename to src/components/common/assets/AssetImage.tsx diff --git a/src/components/Asset/AssetRate.tsx b/src/components/common/assets/AssetRate.tsx similarity index 84% rename from src/components/Asset/AssetRate.tsx rename to src/components/common/assets/AssetRate.tsx index b40e8ae0..1bcc4526 100644 --- a/src/components/Asset/AssetRate.tsx +++ b/src/components/common/assets/AssetRate.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' -import { FormattedNumber } from 'components/FormattedNumber' -import { InfoCircle } from 'components/Icons' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { InfoCircle } from 'components/common/Icons' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' interface Props { rate: number diff --git a/src/components/Asset/AssetSymbol.tsx b/src/components/common/assets/AssetSymbol.tsx similarity index 86% rename from src/components/Asset/AssetSymbol.tsx rename to src/components/common/assets/AssetSymbol.tsx index becc4d71..3d7837db 100644 --- a/src/components/Asset/AssetSymbol.tsx +++ b/src/components/common/assets/AssetSymbol.tsx @@ -1,4 +1,4 @@ -import Text from 'components/Text' +import Text from 'components/common/Text' interface Props { symbol: string diff --git a/src/components/Chain/ChainLogo.tsx b/src/components/common/chain/ChainLogo.tsx similarity index 86% rename from src/components/Chain/ChainLogo.tsx rename to src/components/common/chain/ChainLogo.tsx index 42100eed..6d84497d 100644 --- a/src/components/Chain/ChainLogo.tsx +++ b/src/components/common/chain/ChainLogo.tsx @@ -1,4 +1,4 @@ -import { Neutron, Osmo } from 'components/Icons' +import { Neutron, Osmo } from 'components/common/Icons' import { ChainInfoID } from 'types/enums/wallet' interface Props { diff --git a/src/components/Earn/Tab.tsx b/src/components/earn/Tab.tsx similarity index 100% rename from src/components/Earn/Tab.tsx rename to src/components/earn/Tab.tsx diff --git a/src/components/Earn/Farm/FarmIntro.tsx b/src/components/earn/farm/FarmIntro.tsx similarity index 84% rename from src/components/Earn/Farm/FarmIntro.tsx rename to src/components/earn/farm/FarmIntro.tsx index 7b7b48bc..6edbab6a 100644 --- a/src/components/Earn/Farm/FarmIntro.tsx +++ b/src/components/earn/farm/FarmIntro.tsx @@ -1,6 +1,6 @@ -import Button from 'components/Button' -import { PlusSquared } from 'components/Icons' -import Intro from 'components/Intro' +import Button from 'components/common/Button' +import { PlusSquared } from 'components/common/Icons' +import Intro from 'components/common/Intro' import { DocURL } from 'types/enums/docURL' export default function FarmIntro() { diff --git a/src/components/Earn/Farm/Table/AvailableVaultsTable.tsx b/src/components/earn/farm/Table/AvailableVaultsTable.tsx similarity index 78% rename from src/components/Earn/Farm/Table/AvailableVaultsTable.tsx rename to src/components/earn/farm/Table/AvailableVaultsTable.tsx index 6107929f..8765c260 100644 --- a/src/components/Earn/Farm/Table/AvailableVaultsTable.tsx +++ b/src/components/earn/farm/Table/AvailableVaultsTable.tsx @@ -1,7 +1,7 @@ import React from 'react' -import useAvailableColumns from 'components/Earn/Farm/Table/Columns/useAvailableColumns' -import Table from 'components/Table' +import useAvailableColumns from 'components/earn/farm/Table/Columns/useAvailableColumns' +import Table from 'components/common/Table' type Props = { data: Vault[] diff --git a/src/components/Earn/Farm/Table/Columns/Apy.tsx b/src/components/earn/farm/Table/Columns/Apy.tsx similarity index 79% rename from src/components/Earn/Farm/Table/Columns/Apy.tsx rename to src/components/earn/farm/Table/Columns/Apy.tsx index e1000ed6..c27d0e7e 100644 --- a/src/components/Earn/Farm/Table/Columns/Apy.tsx +++ b/src/components/earn/farm/Table/Columns/Apy.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' export const APY_META = { accessorKey: 'apy', header: 'APY' } diff --git a/src/components/Earn/Farm/Table/Columns/Deposit.tsx b/src/components/earn/farm/Table/Columns/Deposit.tsx similarity index 84% rename from src/components/Earn/Farm/Table/Columns/Deposit.tsx rename to src/components/earn/farm/Table/Columns/Deposit.tsx index 207b21ca..5160ac6f 100644 --- a/src/components/Earn/Farm/Table/Columns/Deposit.tsx +++ b/src/components/earn/farm/Table/Columns/Deposit.tsx @@ -1,7 +1,7 @@ import React from 'react' -import ActionButton from 'components/Button/ActionButton' -import Loading from 'components/Loading' +import ActionButton from 'components/common/Button/ActionButton' +import Loading from 'components/common/Loading' import useStore from 'store' interface Props { diff --git a/src/components/Earn/Farm/Table/Columns/DepositCap.tsx b/src/components/earn/farm/Table/Columns/DepositCap.tsx similarity index 85% rename from src/components/Earn/Farm/Table/Columns/DepositCap.tsx rename to src/components/earn/farm/Table/Columns/DepositCap.tsx index e12c47ff..2e12c69e 100644 --- a/src/components/Earn/Farm/Table/Columns/DepositCap.tsx +++ b/src/components/earn/farm/Table/Columns/DepositCap.tsx @@ -1,7 +1,7 @@ import { Row } from '@tanstack/react-table' -import DepositCapCell from 'components/DepositCapCell' -import Loading from 'components/Loading' +import DepositCapCell from 'components/common/DepositCapCell' +import Loading from 'components/common/Loading' export const DEPOSIT_CAP_META = { accessorKey: 'cap', header: 'Deposit Cap' } diff --git a/src/components/Earn/Farm/Table/Columns/Details.tsx b/src/components/earn/farm/Table/Columns/Details.tsx similarity index 83% rename from src/components/Earn/Farm/Table/Columns/Details.tsx rename to src/components/earn/farm/Table/Columns/Details.tsx index 65e920c5..644a6058 100644 --- a/src/components/Earn/Farm/Table/Columns/Details.tsx +++ b/src/components/earn/farm/Table/Columns/Details.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames' import React from 'react' -import { ChevronDown } from 'components/Icons' -import Loading from 'components/Loading' +import { ChevronDown } from 'components/common/Icons' +import Loading from 'components/common/Loading' export const DETAILS_META = { accessorKey: 'details', enableSorting: false, header: 'Deposit' } diff --git a/src/components/Earn/Farm/Table/Columns/MaxLTV.tsx b/src/components/earn/farm/Table/Columns/MaxLTV.tsx similarity index 80% rename from src/components/Earn/Farm/Table/Columns/MaxLTV.tsx rename to src/components/earn/farm/Table/Columns/MaxLTV.tsx index 7d90c756..909f3717 100644 --- a/src/components/Earn/Farm/Table/Columns/MaxLTV.tsx +++ b/src/components/earn/farm/Table/Columns/MaxLTV.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' export const LTV_MAX_META = { accessorKey: 'ltv.max', header: 'Max LTV' } diff --git a/src/components/Earn/Farm/Table/Columns/Name.tsx b/src/components/earn/farm/Table/Columns/Name.tsx similarity index 93% rename from src/components/Earn/Farm/Table/Columns/Name.tsx rename to src/components/earn/farm/Table/Columns/Name.tsx index f8b4a64c..1f190fa8 100644 --- a/src/components/Earn/Farm/Table/Columns/Name.tsx +++ b/src/components/earn/farm/Table/Columns/Name.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import React from 'react' -import DoubleLogo from 'components/DoubleLogo' -import Text from 'components/Text' -import TitleAndSubCell from 'components/TitleAndSubCell' +import DoubleLogo from 'components/common/DoubleLogo' +import Text from 'components/common/Text' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import { VaultStatus } from 'types/enums/vault' import { produceCountdown } from 'utils/formatters' diff --git a/src/components/Earn/Farm/Table/Columns/PositionValue.tsx b/src/components/earn/farm/Table/Columns/PositionValue.tsx similarity index 90% rename from src/components/Earn/Farm/Table/Columns/PositionValue.tsx rename to src/components/earn/farm/Table/Columns/PositionValue.tsx index b3e4590d..9209ac59 100644 --- a/src/components/Earn/Farm/Table/Columns/PositionValue.tsx +++ b/src/components/earn/farm/Table/Columns/PositionValue.tsx @@ -1,6 +1,6 @@ import React from 'react' -import DisplayCurrency from 'components/DisplayCurrency' +import DisplayCurrency from 'components/common/DisplayCurrency' import { ORACLE_DENOM } from 'constants/oracle' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Earn/Farm/Table/Columns/TVL.tsx b/src/components/earn/farm/Table/Columns/TVL.tsx similarity index 80% rename from src/components/Earn/Farm/Table/Columns/TVL.tsx rename to src/components/earn/farm/Table/Columns/TVL.tsx index 8b9e1b9b..3ef3d2b4 100644 --- a/src/components/Earn/Farm/Table/Columns/TVL.tsx +++ b/src/components/earn/farm/Table/Columns/TVL.tsx @@ -1,7 +1,7 @@ import React from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import Loading from 'components/Loading' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Loading from 'components/common/Loading' import { BNCoin } from 'types/classes/BNCoin' export const TVL_META = { accessorKey: 'tvl', header: 'TVL' } diff --git a/src/components/Earn/Farm/Table/Columns/useAvailableColumns.tsx b/src/components/earn/farm/Table/Columns/useAvailableColumns.tsx similarity index 73% rename from src/components/Earn/Farm/Table/Columns/useAvailableColumns.tsx rename to src/components/earn/farm/Table/Columns/useAvailableColumns.tsx index dc81f9cc..7b155b2c 100644 --- a/src/components/Earn/Farm/Table/Columns/useAvailableColumns.tsx +++ b/src/components/earn/farm/Table/Columns/useAvailableColumns.tsx @@ -1,16 +1,16 @@ import { ColumnDef } from '@tanstack/react-table' import { useMemo } from 'react' -import Apy, { APY_META } from 'components/Earn/Farm/Table/Columns/Apy' -import { Deposit } from 'components/Earn/Farm/Table/Columns/Deposit' +import Apy, { APY_META } from 'components/earn/farm/Table/Columns/Apy' +import { Deposit } from 'components/earn/farm/Table/Columns/Deposit' import DepositCap, { DEPOSIT_CAP_META, depositCapSortingFn, -} from 'components/Earn/Farm/Table/Columns/DepositCap' -import MaxLTV, { LTV_MAX_META } from 'components/Earn/Farm/Table/Columns/MaxLTV' -import Name, { NAME_META } from 'components/Earn/Farm/Table/Columns/Name' -import TVL, { TVL_META } from 'components/Earn/Farm/Table/Columns/TVL' -import { DETAILS_META } from 'components/Earn/Farm/Table/Columns/Details' +} from 'components/earn/farm/Table/Columns/DepositCap' +import MaxLTV, { LTV_MAX_META } from 'components/earn/farm/Table/Columns/MaxLTV' +import Name, { NAME_META } from 'components/earn/farm/Table/Columns/Name' +import TVL, { TVL_META } from 'components/earn/farm/Table/Columns/TVL' +import { DETAILS_META } from 'components/earn/farm/Table/Columns/Details' interface Props { isLoading: boolean diff --git a/src/components/Earn/Farm/Table/Columns/useDepositedColumns.tsx b/src/components/earn/farm/Table/Columns/useDepositedColumns.tsx similarity index 78% rename from src/components/Earn/Farm/Table/Columns/useDepositedColumns.tsx rename to src/components/earn/farm/Table/Columns/useDepositedColumns.tsx index 44a6559a..56e62b91 100644 --- a/src/components/Earn/Farm/Table/Columns/useDepositedColumns.tsx +++ b/src/components/earn/farm/Table/Columns/useDepositedColumns.tsx @@ -1,18 +1,18 @@ import { ColumnDef, Row } from '@tanstack/react-table' import { useMemo } from 'react' -import Apy, { APY_META } from 'components/Earn/Farm/Table/Columns/Apy' +import Apy, { APY_META } from 'components/earn/farm/Table/Columns/Apy' import DepositCap, { DEPOSIT_CAP_META, depositCapSortingFn, -} from 'components/Earn/Farm/Table/Columns/DepositCap' -import Details, { DETAILS_META } from 'components/Earn/Farm/Table/Columns/Details' -import MaxLTV, { LTV_MAX_META } from 'components/Earn/Farm/Table/Columns/MaxLTV' -import Name, { NAME_META } from 'components/Earn/Farm/Table/Columns/Name' +} from 'components/earn/farm/Table/Columns/DepositCap' +import Details, { DETAILS_META } from 'components/earn/farm/Table/Columns/Details' +import MaxLTV, { LTV_MAX_META } from 'components/earn/farm/Table/Columns/MaxLTV' +import Name, { NAME_META } from 'components/earn/farm/Table/Columns/Name' import PositionValue, { POSITION_VALUE_META, -} from 'components/Earn/Farm/Table/Columns/PositionValue' -import TVL, { TVL_META } from 'components/Earn/Farm/Table/Columns/TVL' +} from 'components/earn/farm/Table/Columns/PositionValue' +import TVL, { TVL_META } from 'components/earn/farm/Table/Columns/TVL' interface Props { isLoading: boolean diff --git a/src/components/Earn/Farm/Table/DepositedVaultsTable.tsx b/src/components/earn/farm/Table/DepositedVaultsTable.tsx similarity index 82% rename from src/components/Earn/Farm/Table/DepositedVaultsTable.tsx rename to src/components/earn/farm/Table/DepositedVaultsTable.tsx index 4d6e23c2..3b7caeef 100644 --- a/src/components/Earn/Farm/Table/DepositedVaultsTable.tsx +++ b/src/components/earn/farm/Table/DepositedVaultsTable.tsx @@ -2,9 +2,9 @@ import { Row } from '@tanstack/react-table' import { Table as TanStackTable } from '@tanstack/table-core/build/lib/types' import React, { useCallback } from 'react' -import useDepositedColumns from 'components/Earn/Farm/Table/Columns/useDepositedColumns' -import VaultExpanded from 'components/Earn/Farm/VaultExpanded' -import Table from 'components/Table' +import useDepositedColumns from 'components/earn/farm/Table/Columns/useDepositedColumns' +import VaultExpanded from 'components/earn/farm/VaultExpanded' +import Table from 'components/common/Table' type Props = { data: DepositedVault[] diff --git a/src/components/Earn/Farm/VaultExpanded.tsx b/src/components/earn/farm/VaultExpanded.tsx similarity index 96% rename from src/components/Earn/Farm/VaultExpanded.tsx rename to src/components/earn/farm/VaultExpanded.tsx index 510f51f7..2dbc04dc 100644 --- a/src/components/Earn/Farm/VaultExpanded.tsx +++ b/src/components/earn/farm/VaultExpanded.tsx @@ -2,9 +2,9 @@ import { Row } from '@tanstack/react-table' import moment from 'moment' import { useState } from 'react' -import Button from 'components/Button' -import { AccountArrowDown, LockLocked, LockUnlocked, Plus } from 'components/Icons' -import { Tooltip } from 'components/Tooltip' +import Button from 'components/common/Button' +import { AccountArrowDown, LockLocked, LockUnlocked, Plus } from 'components/common/Icons' +import { Tooltip } from 'components/common/Tooltip' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Earn/Farm/VaultRow.tsx b/src/components/earn/farm/VaultRow.tsx similarity index 100% rename from src/components/Earn/Farm/VaultRow.tsx rename to src/components/earn/farm/VaultRow.tsx diff --git a/src/components/Earn/Farm/VaultUnlockBanner.tsx b/src/components/earn/farm/VaultUnlockBanner.tsx similarity index 91% rename from src/components/Earn/Farm/VaultUnlockBanner.tsx rename to src/components/earn/farm/VaultUnlockBanner.tsx index e06acc37..d6f833f9 100644 --- a/src/components/Earn/Farm/VaultUnlockBanner.tsx +++ b/src/components/earn/farm/VaultUnlockBanner.tsx @@ -1,8 +1,8 @@ import { useState } from 'react' -import Button from 'components/Button' -import { ChevronRight } from 'components/Icons' -import NotificationBanner from 'components/NotificationBanner' +import Button from 'components/common/Button' +import { ChevronRight } from 'components/common/Icons' +import NotificationBanner from 'components/common/NotificationBanner' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Earn/Farm/Vaults.tsx b/src/components/earn/farm/Vaults.tsx similarity index 92% rename from src/components/Earn/Farm/Vaults.tsx rename to src/components/earn/farm/Vaults.tsx index 56f7c8fa..be0a2d20 100644 --- a/src/components/Earn/Farm/Vaults.tsx +++ b/src/components/earn/farm/Vaults.tsx @@ -1,8 +1,8 @@ import { Suspense, useMemo } from 'react' -import AvailableVaultsTable from 'components/Earn/Farm/Table/AvailableVaultsTable' -import DepositedVaultsTable from 'components/Earn/Farm/Table/DepositedVaultsTable' -import VaultUnlockBanner from 'components/Earn/Farm/VaultUnlockBanner' +import AvailableVaultsTable from 'components/earn/farm/Table/AvailableVaultsTable' +import DepositedVaultsTable from 'components/earn/farm/Table/DepositedVaultsTable' +import VaultUnlockBanner from 'components/earn/farm/VaultUnlockBanner' import { BN_ZERO } from 'constants/math' import useAccountId from 'hooks/useAccountId' import useDepositedVaults from 'hooks/useDepositedVaults' diff --git a/src/components/Earn/Lend/LendIntro.tsx b/src/components/earn/lend/LendIntro.tsx similarity index 80% rename from src/components/Earn/Lend/LendIntro.tsx rename to src/components/earn/lend/LendIntro.tsx index b783b5d7..bbe32d45 100644 --- a/src/components/Earn/Lend/LendIntro.tsx +++ b/src/components/earn/lend/LendIntro.tsx @@ -1,6 +1,6 @@ -import ActionButton from 'components/Button/ActionButton' -import { ArrowUpLine } from 'components/Icons' -import Intro from 'components/Intro' +import ActionButton from 'components/common/Button/ActionButton' +import { ArrowUpLine } from 'components/common/Icons' +import Intro from 'components/common/Intro' import useStore from 'store' export default function LendIntro() { diff --git a/src/components/Earn/Lend/LendingActionButtons.tsx b/src/components/earn/lend/LendingActionButtons.tsx similarity index 91% rename from src/components/Earn/Lend/LendingActionButtons.tsx rename to src/components/earn/lend/LendingActionButtons.tsx index 01cc1870..4fc28613 100644 --- a/src/components/Earn/Lend/LendingActionButtons.tsx +++ b/src/components/earn/lend/LendingActionButtons.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' -import { ACCOUNT_MENU_BUTTON_ID } from 'components/Account/AccountMenuContent' -import Button from 'components/Button' -import ActionButton from 'components/Button/ActionButton' -import { ArrowDownLine, ArrowUpLine, Enter, ExclamationMarkCircled } from 'components/Icons' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import { ACCOUNT_MENU_BUTTON_ID } from 'components/account/AccountMenuContent' +import Button from 'components/common/Button' +import ActionButton from 'components/common/Button/ActionButton' +import { ArrowDownLine, ArrowUpLine, Enter, ExclamationMarkCircled } from 'components/common/Icons' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import ConditionalWrapper from 'hocs/ConditionalWrapper' import useAccountId from 'hooks/useAccountId' import useAlertDialog from 'hooks/useAlertDialog' diff --git a/src/components/Earn/Lend/Lends.tsx b/src/components/earn/lend/Lends.tsx similarity index 89% rename from src/components/Earn/Lend/Lends.tsx rename to src/components/earn/lend/Lends.tsx index c282223e..e169f385 100644 --- a/src/components/Earn/Lend/Lends.tsx +++ b/src/components/earn/lend/Lends.tsx @@ -1,5 +1,5 @@ -import AvailableLendsTable from 'components/Earn/Lend/Table/AvailableLendsTable' -import DepositedLendsTable from 'components/Earn/Lend/Table/DepositedLendsTable' +import AvailableLendsTable from 'components/earn/lend/Table/AvailableLendsTable' +import DepositedLendsTable from 'components/earn/lend/Table/DepositedLendsTable' import { BN_ZERO } from 'constants/math' import useLendEnabledAssets from 'hooks/assets/useLendEnabledAssets' import useLendingMarketAssetsTableData from 'hooks/useLendingMarketAssetsTableData' diff --git a/src/components/Earn/Lend/Table/AvailableLendsTable.tsx b/src/components/earn/lend/Table/AvailableLendsTable.tsx similarity index 70% rename from src/components/Earn/Lend/Table/AvailableLendsTable.tsx rename to src/components/earn/lend/Table/AvailableLendsTable.tsx index e93d83b6..a8b10b5b 100644 --- a/src/components/Earn/Lend/Table/AvailableLendsTable.tsx +++ b/src/components/earn/lend/Table/AvailableLendsTable.tsx @@ -1,12 +1,12 @@ import { Row } from '@tanstack/react-table' import { useCallback } from 'react' -import LendingActionButtons from 'components/Earn/Lend/LendingActionButtons' -import { NAME_META } from 'components/Earn/Lend/Table/Columns/Name' -import useAvailableColumns from 'components/Earn/Lend/Table/Columns/useAvailableColumns' -import MarketDetails from 'components/MarketDetails' -import Table from 'components/Table' -import ActionButtonRow from 'components/Table/ActionButtonRow' +import LendingActionButtons from 'components/earn/lend/LendingActionButtons' +import { NAME_META } from 'components/earn/lend/Table/Columns/Name' +import useAvailableColumns from 'components/earn/lend/Table/Columns/useAvailableColumns' +import MarketDetails from 'components/common/MarketDetails' +import Table from 'components/common/Table' +import ActionButtonRow from 'components/common/Table/ActionButtonRow' type Props = { data: LendingMarketTableData[] diff --git a/src/components/Earn/Lend/Table/Columns/Apy.tsx b/src/components/earn/lend/Table/Columns/Apy.tsx similarity index 80% rename from src/components/Earn/Lend/Table/Columns/Apy.tsx rename to src/components/earn/lend/Table/Columns/Apy.tsx index 9525d895..1292c53e 100644 --- a/src/components/Earn/Lend/Table/Columns/Apy.tsx +++ b/src/components/earn/lend/Table/Columns/Apy.tsx @@ -1,5 +1,5 @@ -import AssetRate from 'components/Asset/AssetRate' -import Loading from 'components/Loading' +import AssetRate from 'components/common/assets/AssetRate' +import Loading from 'components/common/Loading' export const APY_META = { accessorKey: 'apy.deposit', header: 'APY', meta: { className: 'w-40' } } diff --git a/src/components/Earn/Lend/Table/Columns/DepositCap.tsx b/src/components/earn/lend/Table/Columns/DepositCap.tsx similarity index 88% rename from src/components/Earn/Lend/Table/Columns/DepositCap.tsx rename to src/components/earn/lend/Table/Columns/DepositCap.tsx index 896c6048..160fc468 100644 --- a/src/components/Earn/Lend/Table/Columns/DepositCap.tsx +++ b/src/components/earn/lend/Table/Columns/DepositCap.tsx @@ -1,8 +1,8 @@ import { Row } from '@tanstack/react-table' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' -import TitleAndSubCell from 'components/TitleAndSubCell' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import { demagnify } from 'utils/formatters' export const DEPOSIT_CAP_META = { diff --git a/src/components/Earn/Lend/Table/Columns/DepositValue.tsx b/src/components/earn/lend/Table/Columns/DepositValue.tsx similarity index 92% rename from src/components/Earn/Lend/Table/Columns/DepositValue.tsx rename to src/components/earn/lend/Table/Columns/DepositValue.tsx index 3d895ed8..4a2cfff9 100644 --- a/src/components/Earn/Lend/Table/Columns/DepositValue.tsx +++ b/src/components/earn/lend/Table/Columns/DepositValue.tsx @@ -1,6 +1,6 @@ import { Row } from '@tanstack/react-table' -import AmountAndValue from 'components/AmountAndValue' +import AmountAndValue from 'components/common/AmountAndValue' import { BN_ZERO } from 'constants/math' import { BN } from 'utils/helpers' diff --git a/src/components/Earn/Lend/Table/Columns/Manage.tsx b/src/components/earn/lend/Table/Columns/Manage.tsx similarity index 85% rename from src/components/Earn/Lend/Table/Columns/Manage.tsx rename to src/components/earn/lend/Table/Columns/Manage.tsx index 7da716f0..863c2084 100644 --- a/src/components/Earn/Lend/Table/Columns/Manage.tsx +++ b/src/components/earn/lend/Table/Columns/Manage.tsx @@ -1,4 +1,4 @@ -import { ChevronDown, ChevronUp } from 'components/Icons' +import { ChevronDown, ChevronUp } from 'components/common/Icons' export const MANAGE_META = { accessorKey: 'manage', diff --git a/src/components/Earn/Lend/Table/Columns/Name.tsx b/src/components/earn/lend/Table/Columns/Name.tsx similarity index 76% rename from src/components/Earn/Lend/Table/Columns/Name.tsx rename to src/components/earn/lend/Table/Columns/Name.tsx index 965b0513..a2f5db0c 100644 --- a/src/components/Earn/Lend/Table/Columns/Name.tsx +++ b/src/components/earn/lend/Table/Columns/Name.tsx @@ -1,5 +1,5 @@ -import AssetImage from 'components/Asset/AssetImage' -import TitleAndSubCell from 'components/TitleAndSubCell' +import AssetImage from 'components/common/assets/AssetImage' +import TitleAndSubCell from 'components/common/TitleAndSubCell' export const NAME_META = { accessorKey: 'asset.symbol', header: 'Asset', id: 'symbol' } interface Props { diff --git a/src/components/Earn/Lend/Table/Columns/useAvailableColumns.tsx b/src/components/earn/lend/Table/Columns/useAvailableColumns.tsx similarity index 80% rename from src/components/Earn/Lend/Table/Columns/useAvailableColumns.tsx rename to src/components/earn/lend/Table/Columns/useAvailableColumns.tsx index 43811b6f..c066a1a7 100644 --- a/src/components/Earn/Lend/Table/Columns/useAvailableColumns.tsx +++ b/src/components/earn/lend/Table/Columns/useAvailableColumns.tsx @@ -1,13 +1,13 @@ import { ColumnDef } from '@tanstack/react-table' import { useMemo } from 'react' -import Apy, { APY_META } from 'components/Earn/Lend/Table/Columns/Apy' +import Apy, { APY_META } from 'components/earn/lend/Table/Columns/Apy' import DepositCap, { DEPOSIT_CAP_META, marketDepositCapSortingFn, -} from 'components/Earn/Lend/Table/Columns/DepositCap' -import Manage, { MANAGE_META } from 'components/Earn/Lend/Table/Columns/Manage' -import Name, { NAME_META } from 'components/Earn/Lend/Table/Columns/Name' +} from 'components/earn/lend/Table/Columns/DepositCap' +import Manage, { MANAGE_META } from 'components/earn/lend/Table/Columns/Manage' +import Name, { NAME_META } from 'components/earn/lend/Table/Columns/Name' interface Props { isLoading: boolean diff --git a/src/components/Earn/Lend/Table/Columns/useDepositedColumns.tsx b/src/components/earn/lend/Table/Columns/useDepositedColumns.tsx similarity index 81% rename from src/components/Earn/Lend/Table/Columns/useDepositedColumns.tsx rename to src/components/earn/lend/Table/Columns/useDepositedColumns.tsx index c6ea5d50..6274f09e 100644 --- a/src/components/Earn/Lend/Table/Columns/useDepositedColumns.tsx +++ b/src/components/earn/lend/Table/Columns/useDepositedColumns.tsx @@ -1,17 +1,17 @@ import { ColumnDef } from '@tanstack/react-table' import { useMemo } from 'react' -import Apy, { APY_META } from 'components/Earn/Lend/Table/Columns/Apy' +import Apy, { APY_META } from 'components/earn/lend/Table/Columns/Apy' import DepositCap, { DEPOSIT_CAP_META, marketDepositCapSortingFn, -} from 'components/Earn/Lend/Table/Columns/DepositCap' +} from 'components/earn/lend/Table/Columns/DepositCap' import DepositValue, { DEPOSIT_VALUE_META, depositedSortingFn, -} from 'components/Earn/Lend/Table/Columns/DepositValue' -import Manage, { MANAGE_META } from 'components/Earn/Lend/Table/Columns/Manage' -import Name, { NAME_META } from 'components/Earn/Lend/Table/Columns/Name' +} from 'components/earn/lend/Table/Columns/DepositValue' +import Manage, { MANAGE_META } from 'components/earn/lend/Table/Columns/Manage' +import Name, { NAME_META } from 'components/earn/lend/Table/Columns/Name' interface Props { isLoading: boolean diff --git a/src/components/Earn/Lend/Table/DepositedLendsTable.tsx b/src/components/earn/lend/Table/DepositedLendsTable.tsx similarity index 70% rename from src/components/Earn/Lend/Table/DepositedLendsTable.tsx rename to src/components/earn/lend/Table/DepositedLendsTable.tsx index ff355480..42d37ade 100644 --- a/src/components/Earn/Lend/Table/DepositedLendsTable.tsx +++ b/src/components/earn/lend/Table/DepositedLendsTable.tsx @@ -1,12 +1,12 @@ import { Row } from '@tanstack/react-table' import { useCallback } from 'react' -import LendingActionButtons from 'components/Earn/Lend/LendingActionButtons' -import { NAME_META } from 'components/Earn/Lend/Table/Columns/Name' -import useDepositedColumns from 'components/Earn/Lend/Table/Columns/useDepositedColumns' -import MarketDetails from 'components/MarketDetails' -import Table from 'components/Table' -import ActionButtonRow from 'components/Table/ActionButtonRow' +import LendingActionButtons from 'components/earn/lend/LendingActionButtons' +import { NAME_META } from 'components/earn/lend/Table/Columns/Name' +import useDepositedColumns from 'components/earn/lend/Table/Columns/useDepositedColumns' +import MarketDetails from 'components/common/MarketDetails' +import Table from 'components/common/Table' +import ActionButtonRow from 'components/common/Table/ActionButtonRow' type Props = { data: LendingMarketTableData[] diff --git a/src/components/Header/ChainSelect.tsx b/src/components/header/ChainSelect.tsx similarity index 94% rename from src/components/Header/ChainSelect.tsx rename to src/components/header/ChainSelect.tsx index 15ef5931..45686f5a 100644 --- a/src/components/Header/ChainSelect.tsx +++ b/src/components/header/ChainSelect.tsx @@ -3,10 +3,10 @@ import { useCallback, useMemo } from 'react' import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' import { useSWRConfig } from 'swr' -import Button from 'components/Button' -import ChainLogo from 'components/Chain/ChainLogo' -import Overlay from 'components/Overlay' -import Text from 'components/Text' +import Button from 'components/common/Button' +import ChainLogo from 'components/common/chain/ChainLogo' +import Overlay from 'components/common/Overlay' +import Text from 'components/common/Text' import chains from 'configs/chains' import useCurrentChainId from 'hooks/localStorage/useCurrentChainId' import useChainConfig from 'hooks/useChainConfig' diff --git a/src/components/Header/DesktopHeader.tsx b/src/components/header/DesktopHeader.tsx similarity index 86% rename from src/components/Header/DesktopHeader.tsx rename to src/components/header/DesktopHeader.tsx index 42a2775e..2a3448f0 100644 --- a/src/components/Header/DesktopHeader.tsx +++ b/src/components/header/DesktopHeader.tsx @@ -2,14 +2,14 @@ import classNames from 'classnames' import { isDesktop } from 'react-device-detect' import { useMemo } from 'react' -import AccountMenu from 'components/Account/AccountMenu' -import EscButton from 'components/Button/EscButton' -import ChainSelect from 'components/Header/ChainSelect' -import OracleResyncButton from 'components/Header/OracleResyncButton' -import { Coins, CoinsSwap } from 'components/Icons' -import DesktopNavigation from 'components/Navigation/DesktopNavigation' -import RewardsCenter from 'components/RewardsCenter' -import Settings from 'components/Settings' +import AccountMenu from 'components/account/AccountMenu' +import EscButton from 'components/common/Button/EscButton' +import ChainSelect from 'components/header/ChainSelect' +import OracleResyncButton from 'components/header/OracleResyncButton' +import { Coins, CoinsSwap } from 'components/common/Icons' +import DesktopNavigation from 'components/header/navigation/DesktopNavigation' +import RewardsCenter from 'components/header/RewardsCenter' +import Settings from 'components/common/Settings' import Wallet from 'components/Wallet' import useAccountId from 'hooks/useAccountId' import useStore from 'store' diff --git a/src/components/Header/OracleResyncButton.tsx b/src/components/header/OracleResyncButton.tsx similarity index 84% rename from src/components/Header/OracleResyncButton.tsx rename to src/components/header/OracleResyncButton.tsx index 4aa5b6aa..5f5a83ea 100644 --- a/src/components/Header/OracleResyncButton.tsx +++ b/src/components/header/OracleResyncButton.tsx @@ -1,8 +1,8 @@ import { useCallback } from 'react' -import Button from 'components/Button' -import { ExclamationMarkCircled } from 'components/Icons' -import { Tooltip } from 'components/Tooltip' +import Button from 'components/common/Button' +import { ExclamationMarkCircled } from 'components/common/Icons' +import { Tooltip } from 'components/common/Tooltip' import usePricesData from 'hooks/usePriceData' import useStore from 'store' diff --git a/src/components/RewardsCenter.tsx b/src/components/header/RewardsCenter.tsx similarity index 91% rename from src/components/RewardsCenter.tsx rename to src/components/header/RewardsCenter.tsx index 8d7a780c..f2df0e7f 100644 --- a/src/components/RewardsCenter.tsx +++ b/src/components/header/RewardsCenter.tsx @@ -1,12 +1,12 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import AssetBalanceRow from 'components/Asset/AssetBalanceRow' -import Button from 'components/Button' -import DisplayCurrency from 'components/DisplayCurrency' -import Divider from 'components/Divider' -import { Logo } from 'components/Icons' -import Overlay from 'components/Overlay' -import Text from 'components/Text' +import AssetBalanceRow from 'components/common/assets/AssetBalanceRow' +import Button from 'components/common/Button' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Divider from 'components/common/Divider' +import { Logo } from 'components/common/Icons' +import Overlay from 'components/common/Overlay' +import Text from 'components/common/Text' import { ORACLE_DENOM } from 'constants/oracle' import useAllAssets from 'hooks/assets/useAllAssets' import useAccountId from 'hooks/useAccountId' diff --git a/src/components/Navigation/DesktopNavigation.tsx b/src/components/header/navigation/DesktopNavigation.tsx similarity index 92% rename from src/components/Navigation/DesktopNavigation.tsx rename to src/components/header/navigation/DesktopNavigation.tsx index 52b0d511..f194e1d1 100644 --- a/src/components/Navigation/DesktopNavigation.tsx +++ b/src/components/header/navigation/DesktopNavigation.tsx @@ -2,11 +2,11 @@ import { useShuttle } from '@delphi-labs/shuttle-react' import classNames from 'classnames' import { useMemo } from 'react' -import Button from 'components/Button' -import { menuTree } from 'components/Header/DesktopHeader' -import { ChevronDown, Logo } from 'components/Icons' -import { NavLink } from 'components/Navigation/NavLink' -import { NavMenu } from 'components/Navigation/NavMenu' +import Button from 'components/common/Button' +import { menuTree } from 'components/header/DesktopHeader' +import { ChevronDown, Logo } from 'components/common/Icons' +import { NavLink } from 'components/header/navigation/NavLink' +import { NavMenu } from 'components/header/navigation/NavMenu' import useToggle from 'hooks/useToggle' import useStore from 'store' import { WalletID } from 'types/enums/wallet' diff --git a/src/components/Navigation/NavLink.tsx b/src/components/header/navigation/NavLink.tsx similarity index 94% rename from src/components/Navigation/NavLink.tsx rename to src/components/header/navigation/NavLink.tsx index f13ca89c..e54bb1a9 100644 --- a/src/components/Navigation/NavLink.tsx +++ b/src/components/header/navigation/NavLink.tsx @@ -2,7 +2,7 @@ import classNames from 'classnames' import { ReactNode } from 'react' import { NavLink as Link, useSearchParams } from 'react-router-dom' -import { getIsActive } from 'components/Navigation/DesktopNavigation' +import { getIsActive } from 'components/header/navigation/DesktopNavigation' import useAccountId from 'hooks/useAccountId' import useStore from 'store' import { getRoute } from 'utils/route' diff --git a/src/components/Navigation/NavMenu.tsx b/src/components/header/navigation/NavMenu.tsx similarity index 91% rename from src/components/Navigation/NavMenu.tsx rename to src/components/header/navigation/NavMenu.tsx index 3aadbb60..e1bab8c3 100644 --- a/src/components/Navigation/NavMenu.tsx +++ b/src/components/header/navigation/NavMenu.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' -import Divider from 'components/Divider' -import { ChevronDown } from 'components/Icons' -import { NavLink } from 'components/Navigation//NavLink' -import { getIsActive } from 'components/Navigation/DesktopNavigation' -import Text from 'components/Text' +import Divider from 'components/common/Divider' +import { ChevronDown } from 'components/common/Icons' +import { NavLink } from 'components/header/navigation/NavLink' +import { getIsActive } from 'components/header/navigation/DesktopNavigation' +import Text from 'components/common/Text' import useToggle from 'hooks/useToggle' interface Props { diff --git a/src/components/Routes.tsx b/src/components/header/navigation/Routes.tsx similarity index 100% rename from src/components/Routes.tsx rename to src/components/header/navigation/Routes.tsx diff --git a/src/components/HLS/Farm/AvailableHLSVaults.tsx b/src/components/hls/Farm/AvailableHLSVaults.tsx similarity index 88% rename from src/components/HLS/Farm/AvailableHLSVaults.tsx rename to src/components/hls/Farm/AvailableHLSVaults.tsx index 66ae42d0..b6255052 100644 --- a/src/components/HLS/Farm/AvailableHLSVaults.tsx +++ b/src/components/hls/Farm/AvailableHLSVaults.tsx @@ -1,8 +1,8 @@ import { Suspense, useMemo } from 'react' -import { NAME_META } from 'components/HLS/Farm/Table/Columns/Name' -import useAvailableColumns from 'components/HLS/Farm/Table/Columns/useAvailableColumns' -import Table from 'components/Table' +import { NAME_META } from 'components/hls/Farm/Table/Columns/Name' +import useAvailableColumns from 'components/hls/Farm/Table/Columns/useAvailableColumns' +import Table from 'components/common/Table' import { BN_ZERO } from 'constants/math' import useVaults from 'hooks/useVaults' import useStore from 'store' diff --git a/src/components/HLS/Farm/HLSFarmIntro.tsx b/src/components/hls/Farm/HLSFarmIntro.tsx similarity index 82% rename from src/components/HLS/Farm/HLSFarmIntro.tsx rename to src/components/hls/Farm/HLSFarmIntro.tsx index 67137ef5..5612bebf 100644 --- a/src/components/HLS/Farm/HLSFarmIntro.tsx +++ b/src/components/hls/Farm/HLSFarmIntro.tsx @@ -1,8 +1,8 @@ import React from 'react' -import Button from 'components/Button' -import { PlusSquared } from 'components/Icons' -import Intro from 'components/Intro' +import Button from 'components/common/Button' +import { PlusSquared } from 'components/common/Icons' +import Intro from 'components/common/Intro' import { DocURL } from 'types/enums/docURL' export default function HlsFarmIntro() { diff --git a/src/components/HLS/Farm/Table/Columns/APY.tsx b/src/components/hls/Farm/Table/Columns/APY.tsx similarity index 89% rename from src/components/HLS/Farm/Table/Columns/APY.tsx rename to src/components/hls/Farm/Table/Columns/APY.tsx index ce9957f8..0ccea4aa 100644 --- a/src/components/HLS/Farm/Table/Columns/APY.tsx +++ b/src/components/hls/Farm/Table/Columns/APY.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' import useMarketBorrowings from 'hooks/markets/useMarketBorrowings' export const APY_META = { accessorKey: 'apy', header: 'APY Range' } diff --git a/src/components/HLS/Farm/Table/Columns/Deposit.tsx b/src/components/hls/Farm/Table/Columns/Deposit.tsx similarity index 93% rename from src/components/HLS/Farm/Table/Columns/Deposit.tsx rename to src/components/hls/Farm/Table/Columns/Deposit.tsx index 5bd112fb..bdde5356 100644 --- a/src/components/HLS/Farm/Table/Columns/Deposit.tsx +++ b/src/components/hls/Farm/Table/Columns/Deposit.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' import { useCallback } from 'react' -import Button from 'components/Button' -import { Circle, Enter, TrashBin, Wallet } from 'components/Icons' -import Loading from 'components/Loading' -import Text from 'components/Text' +import Button from 'components/common/Button' +import { Circle, Enter, TrashBin, Wallet } from 'components/common/Icons' +import Loading from 'components/common/Loading' +import Text from 'components/common/Text' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' import useAlertDialog from 'hooks/useAlertDialog' diff --git a/src/components/HLS/Farm/Table/Columns/MaxLeverage.tsx b/src/components/hls/Farm/Table/Columns/MaxLeverage.tsx similarity index 85% rename from src/components/HLS/Farm/Table/Columns/MaxLeverage.tsx rename to src/components/hls/Farm/Table/Columns/MaxLeverage.tsx index e501c6ed..503a3c5d 100644 --- a/src/components/HLS/Farm/Table/Columns/MaxLeverage.tsx +++ b/src/components/hls/Farm/Table/Columns/MaxLeverage.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' +import { FormattedNumber } from 'components/common/FormattedNumber' export const MAX_LEV_META = { accessorKey: 'hls.maxLeverage', header: 'Max Leverage' } interface Props { diff --git a/src/components/HLS/Farm/Table/Columns/Name.tsx b/src/components/hls/Farm/Table/Columns/Name.tsx similarity index 87% rename from src/components/HLS/Farm/Table/Columns/Name.tsx rename to src/components/hls/Farm/Table/Columns/Name.tsx index 36c6d658..05edf58c 100644 --- a/src/components/HLS/Farm/Table/Columns/Name.tsx +++ b/src/components/hls/Farm/Table/Columns/Name.tsx @@ -1,6 +1,6 @@ import React from 'react' -import TitleAndSubCell from 'components/TitleAndSubCell' +import TitleAndSubCell from 'components/common/TitleAndSubCell' export const NAME_META = { id: 'name', accessorKey: 'denoms.primary', header: 'Name' } diff --git a/src/components/HLS/Farm/Table/Columns/useAvailableColumns.tsx b/src/components/hls/Farm/Table/Columns/useAvailableColumns.tsx similarity index 74% rename from src/components/HLS/Farm/Table/Columns/useAvailableColumns.tsx rename to src/components/hls/Farm/Table/Columns/useAvailableColumns.tsx index 67ade00c..07298930 100644 --- a/src/components/HLS/Farm/Table/Columns/useAvailableColumns.tsx +++ b/src/components/hls/Farm/Table/Columns/useAvailableColumns.tsx @@ -1,13 +1,13 @@ import { ColumnDef } from '@tanstack/react-table' import React, { useMemo } from 'react' -import DepositCap, { DEPOSIT_CAP_META } from 'components/Earn/Farm/Table/Columns/DepositCap' -import MaxLTV, { LTV_MAX_META } from 'components/Earn/Farm/Table/Columns/MaxLTV' -import Name, { NAME_META } from 'components/Earn/Farm/Table/Columns/Name' -import TVL, { TVL_META } from 'components/Earn/Farm/Table/Columns/TVL' -import Apy, { APY_META } from 'components/HLS/Farm/Table/Columns/APY' -import Deposit, { DEPOSIT_META } from 'components/HLS/Farm/Table/Columns/Deposit' -import MaxLeverage, { MAX_LEV_META } from 'components/HLS/Farm/Table/Columns/MaxLeverage' +import DepositCap, { DEPOSIT_CAP_META } from 'components/earn/farm/Table/Columns/DepositCap' +import MaxLTV, { LTV_MAX_META } from 'components/earn/farm/Table/Columns/MaxLTV' +import Name, { NAME_META } from 'components/earn/farm/Table/Columns/Name' +import TVL, { TVL_META } from 'components/earn/farm/Table/Columns/TVL' +import Apy, { APY_META } from 'components/hls/Farm/Table/Columns/APY' +import Deposit, { DEPOSIT_META } from 'components/hls/Farm/Table/Columns/Deposit' +import MaxLeverage, { MAX_LEV_META } from 'components/hls/Farm/Table/Columns/MaxLeverage' interface Props { isLoading: boolean diff --git a/src/components/HLS/Farm/Table/index.tsx b/src/components/hls/Farm/Table/index.tsx similarity index 100% rename from src/components/HLS/Farm/Table/index.tsx rename to src/components/hls/Farm/Table/index.tsx diff --git a/src/components/HLS/HLSTag.tsx b/src/components/hls/HLSTag.tsx similarity index 82% rename from src/components/HLS/HLSTag.tsx rename to src/components/hls/HLSTag.tsx index 5a6ef552..0ec1b8d9 100644 --- a/src/components/HLS/HLSTag.tsx +++ b/src/components/hls/HLSTag.tsx @@ -1,6 +1,6 @@ import React from 'react' -import Text from 'components/Text' +import Text from 'components/common/Text' export default function HLSTag() { return ( diff --git a/src/components/HLS/Staking/ActiveStakingAccounts.tsx b/src/components/hls/Staking/ActiveStakingAccounts.tsx similarity index 77% rename from src/components/HLS/Staking/ActiveStakingAccounts.tsx rename to src/components/hls/Staking/ActiveStakingAccounts.tsx index 5a52b011..9d87a5e0 100644 --- a/src/components/HLS/Staking/ActiveStakingAccounts.tsx +++ b/src/components/hls/Staking/ActiveStakingAccounts.tsx @@ -1,6 +1,6 @@ -import { NAME_META } from 'components/HLS/Farm/Table/Columns/Name' -import useDepositedColumns from 'components/HLS/Staking/Table/Columns/useDepositedColumns' -import Table from 'components/Table' +import { NAME_META } from 'components/hls/Farm/Table/Columns/Name' +import useDepositedColumns from 'components/hls/Staking/Table/Columns/useDepositedColumns' +import Table from 'components/common/Table' import useHLSStakingAccounts from 'hooks/useHLSStakingAccounts' import useStore from 'store' diff --git a/src/components/HLS/Staking/AvailableHLSStakingAssets.tsx b/src/components/hls/Staking/AvailableHLSStakingAssets.tsx similarity index 82% rename from src/components/HLS/Staking/AvailableHLSStakingAssets.tsx rename to src/components/hls/Staking/AvailableHLSStakingAssets.tsx index f528da93..3706e305 100644 --- a/src/components/HLS/Staking/AvailableHLSStakingAssets.tsx +++ b/src/components/hls/Staking/AvailableHLSStakingAssets.tsx @@ -1,8 +1,8 @@ import { Suspense } from 'react' -import { NAME_META } from 'components/HLS/Farm/Table/Columns/Name' -import useAvailableColumns from 'components/HLS/Staking/Table/Columns/useAvailableColumns' -import Table from 'components/Table' +import { NAME_META } from 'components/hls/Farm/Table/Columns/Name' +import useAvailableColumns from 'components/hls/Staking/Table/Columns/useAvailableColumns' +import Table from 'components/common/Table' import useHLSStakingAssets from 'hooks/useHLSStakingAssets' const title = 'Available Strategies' diff --git a/src/components/HLS/Staking/HLSStakingIntro.tsx b/src/components/hls/Staking/HLSStakingIntro.tsx similarity index 82% rename from src/components/HLS/Staking/HLSStakingIntro.tsx rename to src/components/hls/Staking/HLSStakingIntro.tsx index 8ce9e1be..7b04bc54 100644 --- a/src/components/HLS/Staking/HLSStakingIntro.tsx +++ b/src/components/hls/Staking/HLSStakingIntro.tsx @@ -1,6 +1,6 @@ -import Button from 'components/Button' -import { PlusSquared } from 'components/Icons' -import Intro from 'components/Intro' +import Button from 'components/common/Button' +import { PlusSquared } from 'components/common/Icons' +import Intro from 'components/common/Intro' import { DocURL } from 'types/enums/docURL' export default function HLSStakingIntro() { diff --git a/src/components/HLS/Staking/Table/Columns/Account.tsx b/src/components/hls/Staking/Table/Columns/Account.tsx similarity index 84% rename from src/components/HLS/Staking/Table/Columns/Account.tsx rename to src/components/hls/Staking/Table/Columns/Account.tsx index 73e475eb..3166747b 100644 --- a/src/components/HLS/Staking/Table/Columns/Account.tsx +++ b/src/components/hls/Staking/Table/Columns/Account.tsx @@ -1,7 +1,7 @@ import React from 'react' -import HealthBar from 'components/Account/Health/HealthBar' -import TitleAndSubCell from 'components/TitleAndSubCell' +import HealthBar from 'components/account/Health/HealthBar' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import useHealthComputer from 'hooks/useHealthComputer' export const ACCOUNT_META = { id: 'account', header: 'Account', accessorKey: 'id' } diff --git a/src/components/HLS/Staking/Table/Columns/ActiveApy.tsx b/src/components/hls/Staking/Table/Columns/ActiveApy.tsx similarity index 89% rename from src/components/HLS/Staking/Table/Columns/ActiveApy.tsx rename to src/components/hls/Staking/Table/Columns/ActiveApy.tsx index 3579272e..0118c1e6 100644 --- a/src/components/HLS/Staking/Table/Columns/ActiveApy.tsx +++ b/src/components/hls/Staking/Table/Columns/ActiveApy.tsx @@ -1,9 +1,9 @@ import { Row } from '@tanstack/react-table' import React, { useMemo } from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' -import TitleAndSubCell from 'components/TitleAndSubCell' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import useAllAssets from 'hooks/assets/useAllAssets' import useBorrowAsset from 'hooks/useBorrowAsset' import usePrices from 'hooks/usePrices' diff --git a/src/components/HLS/Staking/Table/Columns/ApyRange.tsx b/src/components/hls/Staking/Table/Columns/ApyRange.tsx similarity index 88% rename from src/components/HLS/Staking/Table/Columns/ApyRange.tsx rename to src/components/hls/Staking/Table/Columns/ApyRange.tsx index c6d1b73f..6bc154b8 100644 --- a/src/components/HLS/Staking/Table/Columns/ApyRange.tsx +++ b/src/components/hls/Staking/Table/Columns/ApyRange.tsx @@ -1,8 +1,8 @@ import { Row } from '@tanstack/react-table' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' -import TitleAndSubCell from 'components/TitleAndSubCell' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import useBorrowAsset from 'hooks/useBorrowAsset' import { getLeveragedApy } from 'utils/math' diff --git a/src/components/HLS/Staking/Table/Columns/DebtValue.tsx b/src/components/hls/Staking/Table/Columns/DebtValue.tsx similarity index 90% rename from src/components/HLS/Staking/Table/Columns/DebtValue.tsx rename to src/components/hls/Staking/Table/Columns/DebtValue.tsx index 1f3771a9..2cf54519 100644 --- a/src/components/HLS/Staking/Table/Columns/DebtValue.tsx +++ b/src/components/hls/Staking/Table/Columns/DebtValue.tsx @@ -1,6 +1,6 @@ import { Row } from '@tanstack/react-table' -import DisplayCurrency from 'components/DisplayCurrency' +import DisplayCurrency from 'components/common/DisplayCurrency' import { BNCoin } from 'types/classes/BNCoin' export const DEBT_VAL_META = { header: 'Debt Value', accessorKey: 'values.debt' } diff --git a/src/components/HLS/Staking/Table/Columns/DepositCap.tsx b/src/components/hls/Staking/Table/Columns/DepositCap.tsx similarity index 90% rename from src/components/HLS/Staking/Table/Columns/DepositCap.tsx rename to src/components/hls/Staking/Table/Columns/DepositCap.tsx index 534d0bf5..5d7a3f99 100644 --- a/src/components/HLS/Staking/Table/Columns/DepositCap.tsx +++ b/src/components/hls/Staking/Table/Columns/DepositCap.tsx @@ -1,7 +1,7 @@ import { Row } from '@tanstack/react-table' import React from 'react' -import DepositCapCell from 'components/DepositCapCell' +import DepositCapCell from 'components/common/DepositCapCell' export const CAP_META = { header: 'Cap', accessorKey: 'strategy.depositCap' } diff --git a/src/components/HLS/Staking/Table/Columns/Leverage.tsx b/src/components/hls/Staking/Table/Columns/Leverage.tsx similarity index 89% rename from src/components/HLS/Staking/Table/Columns/Leverage.tsx rename to src/components/hls/Staking/Table/Columns/Leverage.tsx index f8f4a686..587f0eb9 100644 --- a/src/components/HLS/Staking/Table/Columns/Leverage.tsx +++ b/src/components/hls/Staking/Table/Columns/Leverage.tsx @@ -1,7 +1,7 @@ import { Row } from '@tanstack/react-table' import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' +import { FormattedNumber } from 'components/common/FormattedNumber' export const LEV_META = { accessorKey: 'leverage ', header: 'Leverage' } diff --git a/src/components/HLS/Staking/Table/Columns/Manage.tsx b/src/components/hls/Staking/Table/Columns/Manage.tsx similarity index 95% rename from src/components/HLS/Staking/Table/Columns/Manage.tsx rename to src/components/hls/Staking/Table/Columns/Manage.tsx index 94141d19..dd83a271 100644 --- a/src/components/HLS/Staking/Table/Columns/Manage.tsx +++ b/src/components/hls/Staking/Table/Columns/Manage.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useMemo } from 'react' -import DropDownButton from 'components/Button/DropDownButton' -import { ArrowDownLine, Cross, HandCoins, Plus, Scale } from 'components/Icons' +import DropDownButton from 'components/common/Button/DropDownButton' +import { ArrowDownLine, Cross, HandCoins, Plus, Scale } from 'components/common/Icons' import useCloseHlsStakingPosition from 'hooks/HLS/useClosePositionActions' import useStore from 'store' diff --git a/src/components/HLS/Staking/Table/Columns/MaxLTV.tsx b/src/components/hls/Staking/Table/Columns/MaxLTV.tsx similarity index 80% rename from src/components/HLS/Staking/Table/Columns/MaxLTV.tsx rename to src/components/hls/Staking/Table/Columns/MaxLTV.tsx index 101f0a46..819d26b9 100644 --- a/src/components/HLS/Staking/Table/Columns/MaxLTV.tsx +++ b/src/components/hls/Staking/Table/Columns/MaxLTV.tsx @@ -1,7 +1,7 @@ import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' export const LTV_MAX_META = { accessorKey: 'maxLTV', header: 'Max LTV' } diff --git a/src/components/HLS/Staking/Table/Columns/MaxLeverage.tsx b/src/components/hls/Staking/Table/Columns/MaxLeverage.tsx similarity index 85% rename from src/components/HLS/Staking/Table/Columns/MaxLeverage.tsx rename to src/components/hls/Staking/Table/Columns/MaxLeverage.tsx index 83e69301..9ffcaf26 100644 --- a/src/components/HLS/Staking/Table/Columns/MaxLeverage.tsx +++ b/src/components/hls/Staking/Table/Columns/MaxLeverage.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { FormattedNumber } from 'components/FormattedNumber' +import { FormattedNumber } from 'components/common/FormattedNumber' export const MAX_LEV_META = { accessorKey: 'maxLeverage', header: 'Max Leverage' } diff --git a/src/components/HLS/Staking/Table/Columns/Name.tsx b/src/components/hls/Staking/Table/Columns/Name.tsx similarity index 82% rename from src/components/HLS/Staking/Table/Columns/Name.tsx rename to src/components/hls/Staking/Table/Columns/Name.tsx index eb5ed71c..e2a609d2 100644 --- a/src/components/HLS/Staking/Table/Columns/Name.tsx +++ b/src/components/hls/Staking/Table/Columns/Name.tsx @@ -1,6 +1,6 @@ -import DoubleLogo from 'components/DoubleLogo' -import Loading from 'components/Loading' -import TitleAndSubCell from 'components/TitleAndSubCell' +import DoubleLogo from 'components/common/DoubleLogo' +import Loading from 'components/common/Loading' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import useAsset from 'hooks/assets/useAsset' export const NAME_META = { id: 'name', header: 'Strategy' } diff --git a/src/components/HLS/Staking/Table/Columns/NetValue.tsx b/src/components/hls/Staking/Table/Columns/NetValue.tsx similarity index 90% rename from src/components/HLS/Staking/Table/Columns/NetValue.tsx rename to src/components/hls/Staking/Table/Columns/NetValue.tsx index 3a4733a1..bf2d135c 100644 --- a/src/components/HLS/Staking/Table/Columns/NetValue.tsx +++ b/src/components/hls/Staking/Table/Columns/NetValue.tsx @@ -1,6 +1,6 @@ import { Row } from '@tanstack/react-table' -import DisplayCurrency from 'components/DisplayCurrency' +import DisplayCurrency from 'components/common/DisplayCurrency' import { BNCoin } from 'types/classes/BNCoin' export const NET_VAL_META = { header: 'Net Value', accessorKey: 'values.net' } diff --git a/src/components/HLS/Staking/Table/Columns/PositionValue.tsx b/src/components/hls/Staking/Table/Columns/PositionValue.tsx similarity index 90% rename from src/components/HLS/Staking/Table/Columns/PositionValue.tsx rename to src/components/hls/Staking/Table/Columns/PositionValue.tsx index dd38baf9..da4730fa 100644 --- a/src/components/HLS/Staking/Table/Columns/PositionValue.tsx +++ b/src/components/hls/Staking/Table/Columns/PositionValue.tsx @@ -1,6 +1,6 @@ import { Row } from '@tanstack/react-table' -import DisplayCurrency from 'components/DisplayCurrency' +import DisplayCurrency from 'components/common/DisplayCurrency' import { BNCoin } from 'types/classes/BNCoin' export const POS_VAL_META = { header: 'Pos. Value', accessorKey: 'values.total' } diff --git a/src/components/HLS/Staking/Table/Columns/useAvailableColumns.tsx b/src/components/hls/Staking/Table/Columns/useAvailableColumns.tsx similarity index 78% rename from src/components/HLS/Staking/Table/Columns/useAvailableColumns.tsx rename to src/components/hls/Staking/Table/Columns/useAvailableColumns.tsx index 3c609012..add36700 100644 --- a/src/components/HLS/Staking/Table/Columns/useAvailableColumns.tsx +++ b/src/components/hls/Staking/Table/Columns/useAvailableColumns.tsx @@ -1,15 +1,15 @@ import { ColumnDef } from '@tanstack/react-table' import React, { useMemo } from 'react' -import Deposit, { DEPOSIT_META } from 'components/HLS/Farm/Table/Columns/Deposit' +import Deposit, { DEPOSIT_META } from 'components/hls/Farm/Table/Columns/Deposit' import ApyRange, { APY_RANGE_META, apyRangeSortingFn, -} from 'components/HLS/Staking/Table/Columns/ApyRange' -import DepositCap, { CAP_META } from 'components/HLS/Staking/Table/Columns/DepositCap' -import MaxLeverage, { MAX_LEV_META } from 'components/HLS/Staking/Table/Columns/MaxLeverage' -import MaxLTV, { LTV_MAX_META } from 'components/HLS/Staking/Table/Columns/MaxLTV' -import Name, { NAME_META } from 'components/HLS/Staking/Table/Columns/Name' +} from 'components/hls/Staking/Table/Columns/ApyRange' +import DepositCap, { CAP_META } from 'components/hls/Staking/Table/Columns/DepositCap' +import MaxLeverage, { MAX_LEV_META } from 'components/hls/Staking/Table/Columns/MaxLeverage' +import MaxLTV, { LTV_MAX_META } from 'components/hls/Staking/Table/Columns/MaxLTV' +import Name, { NAME_META } from 'components/hls/Staking/Table/Columns/Name' interface Props { isLoading: boolean diff --git a/src/components/HLS/Staking/Table/Columns/useDepositedColumns.tsx b/src/components/hls/Staking/Table/Columns/useDepositedColumns.tsx similarity index 77% rename from src/components/HLS/Staking/Table/Columns/useDepositedColumns.tsx rename to src/components/hls/Staking/Table/Columns/useDepositedColumns.tsx index 5e58ec30..3b7f0d17 100644 --- a/src/components/HLS/Staking/Table/Columns/useDepositedColumns.tsx +++ b/src/components/hls/Staking/Table/Columns/useDepositedColumns.tsx @@ -1,29 +1,29 @@ import { ColumnDef } from '@tanstack/react-table' import { useMemo } from 'react' -import Account, { ACCOUNT_META } from 'components/HLS/Staking/Table/Columns/Account' +import Account, { ACCOUNT_META } from 'components/hls/Staking/Table/Columns/Account' import ActiveApy, { ACTIVE_APY_META, activeApySortingFn, -} from 'components/HLS/Staking/Table/Columns/ActiveApy' +} from 'components/hls/Staking/Table/Columns/ActiveApy' import DepositCap, { CAP_META, depositCapSortingFn, -} from 'components/HLS/Staking/Table/Columns/DepositCap' +} from 'components/hls/Staking/Table/Columns/DepositCap' import Leverage, { LEV_META, leverageSortingFn, -} from 'components/HLS/Staking/Table/Columns/Leverage' -import Manage, { MANAGE_META } from 'components/HLS/Staking/Table/Columns/Manage' -import Name, { NAME_META } from 'components/HLS/Staking/Table/Columns/Name' +} from 'components/hls/Staking/Table/Columns/Leverage' +import Manage, { MANAGE_META } from 'components/hls/Staking/Table/Columns/Manage' +import Name, { NAME_META } from 'components/hls/Staking/Table/Columns/Name' import NetValue, { NET_VAL_META, netValueSorting, -} from 'components/HLS/Staking/Table/Columns/NetValue' +} from 'components/hls/Staking/Table/Columns/NetValue' import PositionValue, { POS_VAL_META, positionValueSorting, -} from 'components/HLS/Staking/Table/Columns/PositionValue' +} from 'components/hls/Staking/Table/Columns/PositionValue' interface Props { isLoading: boolean diff --git a/src/components/Perps/BalancesTable/Columns/EntryPrice.tsx b/src/components/perps/BalancesTable/Columns/EntryPrice.tsx similarity index 79% rename from src/components/Perps/BalancesTable/Columns/EntryPrice.tsx rename to src/components/perps/BalancesTable/Columns/EntryPrice.tsx index 62f3f60e..ec6d6699 100644 --- a/src/components/Perps/BalancesTable/Columns/EntryPrice.tsx +++ b/src/components/perps/BalancesTable/Columns/EntryPrice.tsx @@ -1,6 +1,6 @@ -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' -import TitleAndSubCell from 'components/TitleAndSubCell' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import usePrice from 'hooks/usePrice' export const ENTRY_PRICE_META = { diff --git a/src/components/Perps/BalancesTable/Columns/Leverage.tsx b/src/components/perps/BalancesTable/Columns/Leverage.tsx similarity index 78% rename from src/components/Perps/BalancesTable/Columns/Leverage.tsx rename to src/components/perps/BalancesTable/Columns/Leverage.tsx index db402e24..8043e973 100644 --- a/src/components/Perps/BalancesTable/Columns/Leverage.tsx +++ b/src/components/perps/BalancesTable/Columns/Leverage.tsx @@ -1,6 +1,6 @@ -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' -import TitleAndSubCell from 'components/TitleAndSubCell' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' +import TitleAndSubCell from 'components/common/TitleAndSubCell' export const LEVERAGE_META = { accessorKey: 'leverage', diff --git a/src/components/Perps/BalancesTable/Columns/Manage.tsx b/src/components/perps/BalancesTable/Columns/Manage.tsx similarity index 89% rename from src/components/Perps/BalancesTable/Columns/Manage.tsx rename to src/components/perps/BalancesTable/Columns/Manage.tsx index 65fb7ea8..5fe11c77 100644 --- a/src/components/Perps/BalancesTable/Columns/Manage.tsx +++ b/src/components/perps/BalancesTable/Columns/Manage.tsx @@ -1,9 +1,9 @@ import React, { useMemo } from 'react' import { useSearchParams } from 'react-router-dom' -import DropDownButton from 'components/Button/DropDownButton' -import { Cross, Edit } from 'components/Icons' -import { PerpPositionRow } from 'components/Perps/BalancesTable/usePerpsBalancesData' +import DropDownButton from 'components/common/Button/DropDownButton' +import { Cross, Edit } from 'components/common/Icons' +import { PerpPositionRow } from 'components/perps/BalancesTable/usePerpsBalancesData' import useCurrentAccount from 'hooks/useCurrentAccount' import useStore from 'store' import { SearchParams } from 'types/enums/searchParams' diff --git a/src/components/Perps/BalancesTable/Columns/PerpName.tsx b/src/components/perps/BalancesTable/Columns/PerpName.tsx similarity index 74% rename from src/components/Perps/BalancesTable/Columns/PerpName.tsx rename to src/components/perps/BalancesTable/Columns/PerpName.tsx index a7a4f4f8..d9ee4797 100644 --- a/src/components/Perps/BalancesTable/Columns/PerpName.tsx +++ b/src/components/perps/BalancesTable/Columns/PerpName.tsx @@ -1,5 +1,5 @@ -import AssetImage from 'components/Asset/AssetImage' -import TitleAndSubCell from 'components/TitleAndSubCell' +import AssetImage from 'components/common/assets/AssetImage' +import TitleAndSubCell from 'components/common/TitleAndSubCell' export const PERP_NAME_META = { accessorKey: 'asset.symbol', header: 'Asset', id: 'symbol' } diff --git a/src/components/Perps/BalancesTable/Columns/PnL.tsx b/src/components/perps/BalancesTable/Columns/PnL.tsx similarity index 87% rename from src/components/Perps/BalancesTable/Columns/PnL.tsx rename to src/components/perps/BalancesTable/Columns/PnL.tsx index c8ea7db6..0bc06a75 100644 --- a/src/components/Perps/BalancesTable/Columns/PnL.tsx +++ b/src/components/perps/BalancesTable/Columns/PnL.tsx @@ -1,6 +1,6 @@ -import DisplayCurrency from 'components/DisplayCurrency' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import { BN_ZERO } from 'constants/math' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Perps/BalancesTable/Columns/Size.tsx b/src/components/perps/BalancesTable/Columns/Size.tsx similarity index 84% rename from src/components/Perps/BalancesTable/Columns/Size.tsx rename to src/components/perps/BalancesTable/Columns/Size.tsx index f69b9ca3..b48d41c6 100644 --- a/src/components/Perps/BalancesTable/Columns/Size.tsx +++ b/src/components/perps/BalancesTable/Columns/Size.tsx @@ -1,8 +1,8 @@ import { useMemo } from 'react' -import { FormattedNumber } from 'components/FormattedNumber' -import Text from 'components/Text' -import TitleAndSubCell from 'components/TitleAndSubCell' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Text from 'components/common/Text' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import usePrice from 'hooks/usePrice' import { demagnify } from 'utils/formatters' diff --git a/src/components/Perps/BalancesTable/Columns/TradeDirection.tsx b/src/components/perps/BalancesTable/Columns/TradeDirection.tsx similarity index 93% rename from src/components/Perps/BalancesTable/Columns/TradeDirection.tsx rename to src/components/perps/BalancesTable/Columns/TradeDirection.tsx index ff081d23..713a311f 100644 --- a/src/components/Perps/BalancesTable/Columns/TradeDirection.tsx +++ b/src/components/perps/BalancesTable/Columns/TradeDirection.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames' -import Text from 'components/Text' +import Text from 'components/common/Text' export const PERP_TYPE_META = { accessorKey: 'tradeDirection', header: 'Side' } diff --git a/src/components/Perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx b/src/components/perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx similarity index 73% rename from src/components/Perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx rename to src/components/perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx index 1bb97e9f..9731434a 100644 --- a/src/components/Perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx +++ b/src/components/perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx @@ -1,16 +1,16 @@ import { ColumnDef } from '@tanstack/react-table' import { useMemo } from 'react' -import EntryPrice, { ENTRY_PRICE_META } from 'components/Perps/BalancesTable/Columns/EntryPrice' -import Leverage, { LEVERAGE_META } from 'components/Perps/BalancesTable/Columns/Leverage' -import Manage, { MANAGE_META } from 'components/Perps/BalancesTable/Columns/Manage' -import { PERP_NAME_META, PerpName } from 'components/Perps/BalancesTable/Columns/PerpName' -import PnL, { PNL_META } from 'components/Perps/BalancesTable/Columns/PnL' -import Size, { SIZE_META } from 'components/Perps/BalancesTable/Columns/Size' +import EntryPrice, { ENTRY_PRICE_META } from 'components/perps/BalancesTable/Columns/EntryPrice' +import Leverage, { LEVERAGE_META } from 'components/perps/BalancesTable/Columns/Leverage' +import Manage, { MANAGE_META } from 'components/perps/BalancesTable/Columns/Manage' +import { PERP_NAME_META, PerpName } from 'components/perps/BalancesTable/Columns/PerpName' +import PnL, { PNL_META } from 'components/perps/BalancesTable/Columns/PnL' +import Size, { SIZE_META } from 'components/perps/BalancesTable/Columns/Size' import TradeDirection, { PERP_TYPE_META, -} from 'components/Perps/BalancesTable/Columns/TradeDirection' -import { PerpPositionRow } from 'components/Perps/BalancesTable/usePerpsBalancesData' +} from 'components/perps/BalancesTable/Columns/TradeDirection' +import { PerpPositionRow } from 'components/perps/BalancesTable/usePerpsBalancesData' export default function usePerpsBalancesTable() { return useMemo[]>(() => { diff --git a/src/components/Perps/BalancesTable/index.tsx b/src/components/perps/BalancesTable/index.tsx similarity index 62% rename from src/components/Perps/BalancesTable/index.tsx rename to src/components/perps/BalancesTable/index.tsx index 4f846e1d..6e643172 100644 --- a/src/components/Perps/BalancesTable/index.tsx +++ b/src/components/perps/BalancesTable/index.tsx @@ -1,6 +1,6 @@ -import usePerpsBalancesColumns from 'components/Perps/BalancesTable/Columns/usePerpsBalancesColumns' -import usePerpsBalancesData from 'components/Perps/BalancesTable/usePerpsBalancesData' -import Table from 'components/Table' +import usePerpsBalancesColumns from 'components/perps/BalancesTable/Columns/usePerpsBalancesColumns' +import usePerpsBalancesData from 'components/perps/BalancesTable/usePerpsBalancesData' +import Table from 'components/common/Table' export default function PerpsBalancesTable() { const data = usePerpsBalancesData() diff --git a/src/components/Perps/BalancesTable/usePerpsBalancesData.ts b/src/components/perps/BalancesTable/usePerpsBalancesData.ts similarity index 100% rename from src/components/Perps/BalancesTable/usePerpsBalancesData.ts rename to src/components/perps/BalancesTable/usePerpsBalancesData.ts diff --git a/src/components/Perps/Module/LeverageButtons.tsx b/src/components/perps/Module/LeverageButtons.tsx similarity index 100% rename from src/components/Perps/Module/LeverageButtons.tsx rename to src/components/perps/Module/LeverageButtons.tsx diff --git a/src/components/Perps/Module/OpeningFee.tsx b/src/components/perps/Module/OpeningFee.tsx similarity index 77% rename from src/components/Perps/Module/OpeningFee.tsx rename to src/components/perps/Module/OpeningFee.tsx index d2ff67b6..c56beb62 100644 --- a/src/components/Perps/Module/OpeningFee.tsx +++ b/src/components/perps/Module/OpeningFee.tsx @@ -1,7 +1,7 @@ import BigNumber from 'bignumber.js' -import { CircularProgress } from 'components/CircularProgress' -import DisplayCurrency from 'components/DisplayCurrency' +import { CircularProgress } from 'components/common/CircularProgress' +import DisplayCurrency from 'components/common/DisplayCurrency' import useOpeningFee from 'hooks/perps/useOpeningFee' type Props = { diff --git a/src/components/Perps/Module/Or.tsx b/src/components/perps/Module/Or.tsx similarity index 69% rename from src/components/Perps/Module/Or.tsx rename to src/components/perps/Module/Or.tsx index cb5fb5d6..5f3e6878 100644 --- a/src/components/Perps/Module/Or.tsx +++ b/src/components/perps/Module/Or.tsx @@ -1,5 +1,5 @@ -import Divider from 'components/Divider' -import Text from 'components/Text' +import Divider from 'components/common/Divider' +import Text from 'components/common/Text' export function Or() { return ( diff --git a/src/components/Perps/Module/PerpsManageModule/index.tsx b/src/components/perps/Module/PerpsManageModule/index.tsx similarity index 74% rename from src/components/Perps/Module/PerpsManageModule/index.tsx rename to src/components/perps/Module/PerpsManageModule/index.tsx index ae7d2b99..0712df18 100644 --- a/src/components/Perps/Module/PerpsManageModule/index.tsx +++ b/src/components/perps/Module/PerpsManageModule/index.tsx @@ -1,16 +1,16 @@ import classNames from 'classnames' import { useState } from 'react' -import { Cross } from 'components/Icons' -import { LeverageButtons } from 'components/Perps/Module/LeverageButtons' -import { Or } from 'components/Perps/Module/Or' -import usePerpsManageModule from 'components/Perps/Module/PerpsManageModule/usePerpsManageModule' -import PerpsSummary from 'components/Perps/Module/Summary' -import RangeInput from 'components/RangeInput' -import { Spacer } from 'components/Spacer' -import Text from 'components/Text' -import AssetAmountInput from 'components/Trade/TradeModule/SwapForm/AssetAmountInput' -import { TradeDirectionSelector } from 'components/TradeDirectionSelector' +import { Cross } from 'components/common/Icons' +import LeverageSlider from 'components/common/LeverageSlider' +import { Spacer } from 'components/common/Spacer' +import Text from 'components/common/Text' +import { TradeDirectionSelector } from 'components/common/TradeDirectionSelector' +import { LeverageButtons } from 'components/perps/Module/LeverageButtons' +import { Or } from 'components/perps/Module/Or' +import usePerpsManageModule from 'components/perps/Module/PerpsManageModule/usePerpsManageModule' +import PerpsSummary from 'components/perps/Module/Summary' +import AssetAmountInput from 'components/trade/TradeModule/SwapForm/AssetAmountInput' import { BN } from 'utils/helpers' export function PerpsManageModule() { @@ -56,7 +56,7 @@ export function PerpsManageModule() { /> Position Leverage - {}} /> + {}} type={tradeDirection || 'long'} /> Position Leverage - {}} /> + +
@@ -49,7 +49,7 @@ export default function FundingRate() { setInterval(key as Interval) toggleShow(false) }} - className='w-full text-left px-4 py-2 flex gap-2 items-center hover:bg-white/5 [&:not(:last-child)]:border-b border-white/10' + className='w-full text-center px-3 py-1.5 flex gap-2 items-center hover:bg-white/5 text-[10px]' > {key} diff --git a/src/components/Perps/PerpsInfo/InterestItem.tsx b/src/components/perps/PerpsInfo/InterestItem.tsx similarity index 77% rename from src/components/Perps/PerpsInfo/InterestItem.tsx rename to src/components/perps/PerpsInfo/InterestItem.tsx index 85af00da..5e8611b3 100644 --- a/src/components/Perps/PerpsInfo/InterestItem.tsx +++ b/src/components/perps/PerpsInfo/InterestItem.tsx @@ -1,8 +1,8 @@ import React from 'react' -import AssetSymbol from 'components/Asset/AssetSymbol' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' +import AssetSymbol from 'components/common/assets/AssetSymbol' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' import usePerpsMarket from 'hooks/perps/usePerpsMarket' interface InterestItemProps { diff --git a/src/components/Perps/PerpsInfo/index.tsx b/src/components/perps/PerpsInfo/index.tsx similarity index 81% rename from src/components/Perps/PerpsInfo/index.tsx rename to src/components/perps/PerpsInfo/index.tsx index 41aefa83..3cda2238 100644 --- a/src/components/Perps/PerpsInfo/index.tsx +++ b/src/components/perps/PerpsInfo/index.tsx @@ -1,12 +1,12 @@ import React, { useMemo } from 'react' -import Card from 'components/Card' -import DisplayCurrency from 'components/DisplayCurrency' -import Divider from 'components/Divider' -import Loading from 'components/Loading' -import FundingRate from 'components/Perps/PerpsInfo/FundingRate' -import InterestItem from 'components/Perps/PerpsInfo/InterestItem' -import Text from 'components/Text' +import Card from 'components/common/Card' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Divider from 'components/common/Divider' +import Loading from 'components/common/Loading' +import FundingRate from 'components/perps/PerpsInfo/FundingRate' +import InterestItem from 'components/perps/PerpsInfo/InterestItem' +import Text from 'components/common/Text' import usePerpsMarket from 'hooks/perps/usePerpsMarket' import usePrice from 'hooks/usePrice' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Perps/PerpsPositions.tsx b/src/components/perps/PerpsPositions.tsx similarity index 100% rename from src/components/Perps/PerpsPositions.tsx rename to src/components/perps/PerpsPositions.tsx diff --git a/src/components/Portfolio/Account/Balances.tsx b/src/components/portfolio/Account/Balances.tsx similarity index 88% rename from src/components/Portfolio/Account/Balances.tsx rename to src/components/portfolio/Account/Balances.tsx index 1df9d400..333de715 100644 --- a/src/components/Portfolio/Account/Balances.tsx +++ b/src/components/portfolio/Account/Balances.tsx @@ -1,9 +1,9 @@ import React, { Suspense, useMemo } from 'react' -import AccountBalancesTable from 'components/Account/AccountBalancesTable' -import Card from 'components/Card' -import TableSkeleton from 'components/TableSkeleton' -import Text from 'components/Text' +import AccountBalancesTable from 'components/account/AccountBalancesTable' +import Card from 'components/common/Card' +import TableSkeleton from 'components/common/Table/TableSkeleton' +import Text from 'components/common/Text' import useAccount from 'hooks/accounts/useAccount' import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData' import useLendingMarketAssetsTableData from 'hooks/useLendingMarketAssetsTableData' diff --git a/src/components/Portfolio/Account/BreadCrumbs.tsx b/src/components/portfolio/Account/BreadCrumbs.tsx similarity index 89% rename from src/components/Portfolio/Account/BreadCrumbs.tsx rename to src/components/portfolio/Account/BreadCrumbs.tsx index db43314a..536d648e 100644 --- a/src/components/Portfolio/Account/BreadCrumbs.tsx +++ b/src/components/portfolio/Account/BreadCrumbs.tsx @@ -1,7 +1,7 @@ import { NavLink, useParams, useSearchParams } from 'react-router-dom' -import { ArrowRight } from 'components/Icons' -import Text from 'components/Text' +import { ArrowRight } from 'components/common/Icons' +import Text from 'components/common/Text' import useAccountId from 'hooks/useAccountId' import { getRoute } from 'utils/route' diff --git a/src/components/Portfolio/Account/Summary.tsx b/src/components/portfolio/Account/Summary.tsx similarity index 94% rename from src/components/Portfolio/Account/Summary.tsx rename to src/components/portfolio/Account/Summary.tsx index 8af8fb97..bbf59507 100644 --- a/src/components/Portfolio/Account/Summary.tsx +++ b/src/components/portfolio/Account/Summary.tsx @@ -1,8 +1,8 @@ import { Suspense, useMemo } from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import Skeleton from 'components/Portfolio/SummarySkeleton' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Skeleton from 'components/portfolio/SummarySkeleton' import { MAX_AMOUNT_DECIMALS } from 'constants/math' import useAccount from 'hooks/accounts/useAccount' import useAllAssets from 'hooks/assets/useAllAssets' diff --git a/src/components/Portfolio/Card/Skeleton.tsx b/src/components/portfolio/Card/Skeleton.tsx similarity index 79% rename from src/components/Portfolio/Card/Skeleton.tsx rename to src/components/portfolio/Card/Skeleton.tsx index 85ba4452..3fb0e2e6 100644 --- a/src/components/Portfolio/Card/Skeleton.tsx +++ b/src/components/portfolio/Card/Skeleton.tsx @@ -1,10 +1,10 @@ import React from 'react' -import HealthBar from 'components/Account/Health/HealthBar' -import Card from 'components/Card' -import HLSTag from 'components/HLS/HLSTag' -import Text from 'components/Text' -import TitleAndSubCell from 'components/TitleAndSubCell' +import HealthBar from 'components/account/Health/HealthBar' +import Card from 'components/common/Card' +import HLSTag from 'components/hls/HLSTag' +import Text from 'components/common/Text' +import TitleAndSubCell from 'components/common/TitleAndSubCell' interface Props { stats: { title: React.ReactNode; sub: string }[] diff --git a/src/components/Portfolio/Card/index.tsx b/src/components/portfolio/Card/index.tsx similarity index 96% rename from src/components/Portfolio/Card/index.tsx rename to src/components/portfolio/Card/index.tsx index 82ada887..04242db2 100644 --- a/src/components/Portfolio/Card/index.tsx +++ b/src/components/portfolio/Card/index.tsx @@ -2,9 +2,9 @@ import classNames from 'classnames' import { ReactNode, useMemo } from 'react' import { NavLink, useParams, useSearchParams } from 'react-router-dom' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' -import Skeleton from 'components/Portfolio/Card/Skeleton' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' +import Skeleton from 'components/portfolio/Card/Skeleton' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import { BN_ZERO } from 'constants/math' diff --git a/src/components/Portfolio/Overview/ConnectInfo.tsx b/src/components/portfolio/Overview/ConnectInfo.tsx similarity index 84% rename from src/components/Portfolio/Overview/ConnectInfo.tsx rename to src/components/portfolio/Overview/ConnectInfo.tsx index c555dce3..9c1902cb 100644 --- a/src/components/Portfolio/Overview/ConnectInfo.tsx +++ b/src/components/portfolio/Overview/ConnectInfo.tsx @@ -1,5 +1,5 @@ -import Card from 'components/Card' -import Text from 'components/Text' +import Card from 'components/common/Card' +import Text from 'components/common/Text' import WalletConnectButton from 'components/Wallet/WalletConnectButton' export default function ConnectInfo() { diff --git a/src/components/Portfolio/Overview/Summary.tsx b/src/components/portfolio/Overview/Summary.tsx similarity index 94% rename from src/components/Portfolio/Overview/Summary.tsx rename to src/components/portfolio/Overview/Summary.tsx index a4d2d773..0828627a 100644 --- a/src/components/Portfolio/Overview/Summary.tsx +++ b/src/components/portfolio/Overview/Summary.tsx @@ -1,9 +1,9 @@ import { useMemo } from 'react' import { useParams } from 'react-router-dom' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import SummarySkeleton from 'components/Portfolio/SummarySkeleton' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import SummarySkeleton from 'components/portfolio/SummarySkeleton' import { MAX_AMOUNT_DECIMALS } from 'constants/math' import useAccounts from 'hooks/accounts/useAccounts' import useAllAssets from 'hooks/assets/useAllAssets' diff --git a/src/components/Portfolio/Overview/index.tsx b/src/components/portfolio/Overview/index.tsx similarity index 86% rename from src/components/Portfolio/Overview/index.tsx rename to src/components/portfolio/Overview/index.tsx index 6b3e172f..e0208dde 100644 --- a/src/components/Portfolio/Overview/index.tsx +++ b/src/components/portfolio/Overview/index.tsx @@ -2,13 +2,13 @@ import classNames from 'classnames' import { useCallback } from 'react' import { useParams } from 'react-router-dom' -import AccountCreateFirst from 'components/Account/AccountCreateFirst' -import Button from 'components/Button' -import Card from 'components/Card' -import { PlusCircled } from 'components/Icons' -import PortfolioCard from 'components/Portfolio/Card' -import ConnectInfo from 'components/Portfolio/Overview/ConnectInfo' -import Text from 'components/Text' +import AccountCreateFirst from 'components/account/AccountCreateFirst' +import Button from 'components/common/Button' +import Card from 'components/common/Card' +import { PlusCircled } from 'components/common/Icons' +import PortfolioCard from 'components/portfolio/Card' +import ConnectInfo from 'components/portfolio/Overview/ConnectInfo' +import Text from 'components/common/Text' import WalletBridges from 'components/Wallet/WalletBridges' import useAccountIds from 'hooks/accounts/useAccountIds' import useBaseAsset from 'hooks/assets/useBasetAsset' diff --git a/src/components/Portfolio/PortfolioIntro.tsx b/src/components/portfolio/PortfolioIntro.tsx similarity index 95% rename from src/components/Portfolio/PortfolioIntro.tsx rename to src/components/portfolio/PortfolioIntro.tsx index e359527a..850d1355 100644 --- a/src/components/Portfolio/PortfolioIntro.tsx +++ b/src/components/portfolio/PortfolioIntro.tsx @@ -1,6 +1,6 @@ import { useParams } from 'react-router-dom' -import Intro from 'components/Intro' +import Intro from 'components/common/Intro' import useStore from 'store' export default function PortfolioIntro() { diff --git a/src/components/Portfolio/SummarySkeleton.tsx b/src/components/portfolio/SummarySkeleton.tsx similarity index 81% rename from src/components/Portfolio/SummarySkeleton.tsx rename to src/components/portfolio/SummarySkeleton.tsx index 15f6a495..a8aa1adc 100644 --- a/src/components/Portfolio/SummarySkeleton.tsx +++ b/src/components/portfolio/SummarySkeleton.tsx @@ -1,12 +1,12 @@ import React from 'react' -import HealthBar from 'components/Account/Health/HealthBar' -import HealthIcon from 'components/Account/Health/HealthIcon' -import Card from 'components/Card' -import HLSTag from 'components/HLS/HLSTag' -import Loading from 'components/Loading' -import Text from 'components/Text' -import TitleAndSubCell from 'components/TitleAndSubCell' +import HealthBar from 'components/account/Health/HealthBar' +import HealthIcon from 'components/account/Health/HealthIcon' +import Card from 'components/common/Card' +import HLSTag from 'components/hls/HLSTag' +import Loading from 'components/common/Loading' +import Text from 'components/common/Text' +import TitleAndSubCell from 'components/common/TitleAndSubCell' import useAccount from 'hooks/accounts/useAccount' import { DEFAULT_PORTFOLIO_STATS } from 'utils/constants' diff --git a/src/components/Trade/AccountDetailsCard.tsx b/src/components/trade/AccountDetailsCard.tsx similarity index 94% rename from src/components/Trade/AccountDetailsCard.tsx rename to src/components/trade/AccountDetailsCard.tsx index 3f153243..010bbcae 100644 --- a/src/components/Trade/AccountDetailsCard.tsx +++ b/src/components/trade/AccountDetailsCard.tsx @@ -1,6 +1,6 @@ import { useMemo } from 'react' -import AccountBalancesTable from 'components/Account/AccountBalancesTable' +import AccountBalancesTable from 'components/account/AccountBalancesTable' import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData' import useCurrentAccount from 'hooks/useCurrentAccount' import useLendingMarketAssetsTableData from 'hooks/useLendingMarketAssetsTableData' diff --git a/src/components/Trade/TradeChart/DataFeed.ts b/src/components/trade/TradeChart/DataFeed.ts similarity index 99% rename from src/components/Trade/TradeChart/DataFeed.ts rename to src/components/trade/TradeChart/DataFeed.ts index ba7653ee..78ff9290 100644 --- a/src/components/Trade/TradeChart/DataFeed.ts +++ b/src/components/trade/TradeChart/DataFeed.ts @@ -1,4 +1,4 @@ -import { subscribeOnStream, unsubscribeFromStream } from 'components/Trade/TradeChart/streaming' +import { subscribeOnStream, unsubscribeFromStream } from 'components/trade/TradeChart/streaming' import { pythEndpoints } from 'constants/pyth' import { ErrorCallback, diff --git a/src/components/Trade/TradeChart/PoweredByPyth.tsx b/src/components/trade/TradeChart/PoweredByPyth.tsx similarity index 71% rename from src/components/Trade/TradeChart/PoweredByPyth.tsx rename to src/components/trade/TradeChart/PoweredByPyth.tsx index c743bf56..31897bd0 100644 --- a/src/components/Trade/TradeChart/PoweredByPyth.tsx +++ b/src/components/trade/TradeChart/PoweredByPyth.tsx @@ -1,5 +1,5 @@ -import { PythLogoType } from 'components/Icons' -import Text from 'components/Text' +import { PythLogoType } from 'components/common/Icons' +import Text from 'components/common/Text' export default function PoweredByPyth() { return ( diff --git a/src/components/Trade/TradeChart/constants.ts b/src/components/trade/TradeChart/constants.ts similarity index 100% rename from src/components/Trade/TradeChart/constants.ts rename to src/components/trade/TradeChart/constants.ts diff --git a/src/components/Trade/TradeChart/index.tsx b/src/components/trade/TradeChart/index.tsx similarity index 90% rename from src/components/Trade/TradeChart/index.tsx rename to src/components/trade/TradeChart/index.tsx index a1535274..b3554d5f 100644 --- a/src/components/Trade/TradeChart/index.tsx +++ b/src/components/trade/TradeChart/index.tsx @@ -1,13 +1,13 @@ import { useEffect, useMemo, useRef } from 'react' -import Card from 'components/Card' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import Loading from 'components/Loading' -import Text from 'components/Text' -import { datafeed } from 'components/Trade/TradeChart/DataFeed' -import PoweredByPyth from 'components/Trade/TradeChart/PoweredByPyth' -import { disabledFeatures, enabledFeatures } from 'components/Trade/TradeChart/constants' +import Card from 'components/common/Card' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import Loading from 'components/common/Loading' +import Text from 'components/common/Text' +import { datafeed } from 'components/trade/TradeChart/DataFeed' +import PoweredByPyth from 'components/trade/TradeChart/PoweredByPyth' +import { disabledFeatures, enabledFeatures } from 'components/trade/TradeChart/constants' import { BN_ZERO } from 'constants/math' import usePrices from 'hooks/usePrices' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Trade/TradeChart/streaming.ts b/src/components/trade/TradeChart/streaming.ts similarity index 100% rename from src/components/Trade/TradeChart/streaming.ts rename to src/components/trade/TradeChart/streaming.ts diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetButton.tsx b/src/components/trade/TradeModule/AssetSelector/AssetButton.tsx similarity index 79% rename from src/components/Trade/TradeModule/AssetSelector/AssetButton.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetButton.tsx index 9ed9adbf..53b064e2 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetButton.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetButton.tsx @@ -1,5 +1,5 @@ -import AssetImage from 'components/Asset/AssetImage' -import Button from 'components/Button' +import AssetImage from 'components/common/assets/AssetImage' +import Button from 'components/common/Button' interface Props { asset: Asset diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetItem.tsx b/src/components/trade/TradeModule/AssetSelector/AssetItem.tsx similarity index 91% rename from src/components/Trade/TradeModule/AssetSelector/AssetItem.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetItem.tsx index 2a1e530b..f793a2ce 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetItem.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetItem.tsx @@ -1,11 +1,11 @@ import { useMemo } from 'react' -import AssetImage from 'components/Asset/AssetImage' -import AssetSymbol from 'components/Asset/AssetSymbol' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import { StarFilled, StarOutlined } from 'components/Icons' -import Text from 'components/Text' +import AssetImage from 'components/common/assets/AssetImage' +import AssetSymbol from 'components/common/assets/AssetSymbol' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { StarFilled, StarOutlined } from 'components/common/Icons' +import Text from 'components/common/Text' import { BN_ONE, BN_ZERO, MAX_AMOUNT_DECIMALS, MIN_AMOUNT } from 'constants/math' import useFavoriteAssets from 'hooks/localStorage/useFavoriteAssets' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetList.tsx b/src/components/trade/TradeModule/AssetSelector/AssetList.tsx similarity index 94% rename from src/components/Trade/TradeModule/AssetSelector/AssetList.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetList.tsx index dc9e625d..ba1ef7e4 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetList.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetList.tsx @@ -1,9 +1,9 @@ import classNames from 'classnames' import { useMemo } from 'react' -import { ChevronDown } from 'components/Icons' -import Text from 'components/Text' -import AssetSelectorItem from 'components/Trade/TradeModule/AssetSelector/AssetSelectorItem' +import { ChevronDown } from 'components/common/Icons' +import Text from 'components/common/Text' +import AssetSelectorItem from 'components/trade/TradeModule/AssetSelector/AssetSelectorItem' import useMarketEnabledAssets from 'hooks/assets/useMarketEnabledAssets' import useMarketAssets from 'hooks/markets/useMarketAssets' import useMarketDeposits from 'hooks/markets/useMarketDeposits' diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetOverlay/StablesFilter.tsx b/src/components/trade/TradeModule/AssetSelector/AssetOverlay/StablesFilter.tsx similarity index 90% rename from src/components/Trade/TradeModule/AssetSelector/AssetOverlay/StablesFilter.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetOverlay/StablesFilter.tsx index 554c0916..4787eafb 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetOverlay/StablesFilter.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetOverlay/StablesFilter.tsx @@ -1,5 +1,5 @@ -import Button from 'components/Button' -import Divider from 'components/Divider' +import Button from 'components/common/Button' +import Divider from 'components/common/Divider' interface StablesFilterProps { onFilter: (stables: Asset[]) => void diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetOverlay/index.tsx b/src/components/trade/TradeModule/AssetSelector/AssetOverlay/index.tsx similarity index 91% rename from src/components/Trade/TradeModule/AssetSelector/AssetOverlay/index.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetOverlay/index.tsx index 463effc0..7a2d4322 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetOverlay/index.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetOverlay/index.tsx @@ -1,12 +1,12 @@ import { useCallback, useMemo, useState } from 'react' -import EscButton from 'components/Button/EscButton' -import Divider from 'components/Divider' -import Overlay from 'components/Overlay' -import SearchBar from 'components/SearchBar' -import Text from 'components/Text' -import AssetList from 'components/Trade/TradeModule/AssetSelector/AssetList' -import PairsList from 'components/Trade/TradeModule/AssetSelector/PairsList' +import EscButton from 'components/common/Button/EscButton' +import Divider from 'components/common/Divider' +import Overlay from 'components/common/Overlay' +import SearchBar from 'components/common/SearchBar' +import Text from 'components/common/Text' +import AssetList from 'components/trade/TradeModule/AssetSelector/AssetList' +import PairsList from 'components/trade/TradeModule/AssetSelector/PairsList' import useAllAssets from 'hooks/assets/useAllAssets' import useFilteredAssets from 'hooks/useFilteredAssets' diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetSelectorItem.tsx b/src/components/trade/TradeModule/AssetSelector/AssetSelectorItem.tsx similarity index 92% rename from src/components/Trade/TradeModule/AssetSelector/AssetSelectorItem.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetSelectorItem.tsx index 4fa1b5b5..9c11bfa9 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetSelectorItem.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetSelectorItem.tsx @@ -1,11 +1,11 @@ import { useMemo } from 'react' -import AssetImage from 'components/Asset/AssetImage' -import AssetSymbol from 'components/Asset/AssetSymbol' -import DisplayCurrency from 'components/DisplayCurrency' -import { FormattedNumber } from 'components/FormattedNumber' -import { StarFilled, StarOutlined } from 'components/Icons' -import Text from 'components/Text' +import AssetImage from 'components/common/assets/AssetImage' +import AssetSymbol from 'components/common/assets/AssetSymbol' +import DisplayCurrency from 'components/common/DisplayCurrency' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { StarFilled, StarOutlined } from 'components/common/Icons' +import Text from 'components/common/Text' import { BN_ONE, BN_ZERO, MAX_AMOUNT_DECIMALS, MIN_AMOUNT } from 'constants/math' import useFavoriteAssets from 'hooks/localStorage/useFavoriteAssets' import { BNCoin } from 'types/classes/BNCoin' diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetSelectorPair.tsx b/src/components/trade/TradeModule/AssetSelector/AssetSelectorPair.tsx similarity index 90% rename from src/components/Trade/TradeModule/AssetSelector/AssetSelectorPair.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetSelectorPair.tsx index 95cff7de..d6176157 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetSelectorPair.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetSelectorPair.tsx @@ -1,9 +1,9 @@ import { useCallback } from 'react' -import Button from 'components/Button' -import { ChevronDown } from 'components/Icons' -import Text from 'components/Text' -import AssetOverlay from 'components/Trade/TradeModule/AssetSelector/AssetOverlay' +import Button from 'components/common/Button' +import { ChevronDown } from 'components/common/Icons' +import Text from 'components/common/Text' +import AssetOverlay from 'components/trade/TradeModule/AssetSelector/AssetOverlay' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetSelectorPerps.tsx b/src/components/trade/TradeModule/AssetSelector/AssetSelectorPerps.tsx similarity index 88% rename from src/components/Trade/TradeModule/AssetSelector/AssetSelectorPerps.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetSelectorPerps.tsx index 1b741ca1..02b59e86 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetSelectorPerps.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetSelectorPerps.tsx @@ -1,9 +1,9 @@ import { useCallback } from 'react' -import Button from 'components/Button' -import { ChevronDown } from 'components/Icons' -import Text from 'components/Text' -import AssetOverlay from 'components/Trade/TradeModule/AssetSelector/AssetOverlay' +import Button from 'components/common/Button' +import { ChevronDown } from 'components/common/Icons' +import Text from 'components/common/Text' +import AssetOverlay from 'components/trade/TradeModule/AssetSelector/AssetOverlay' import usePerpsEnabledAssets from 'hooks/assets/usePerpsEnabledAssets' import usePerpsAsset from 'hooks/perps/usePerpsAsset' import useStore from 'store' diff --git a/src/components/Trade/TradeModule/AssetSelector/AssetSelectorSingle.tsx b/src/components/trade/TradeModule/AssetSelector/AssetSelectorSingle.tsx similarity index 92% rename from src/components/Trade/TradeModule/AssetSelector/AssetSelectorSingle.tsx rename to src/components/trade/TradeModule/AssetSelector/AssetSelectorSingle.tsx index 498aaf6f..7cf7edfa 100644 --- a/src/components/Trade/TradeModule/AssetSelector/AssetSelectorSingle.tsx +++ b/src/components/trade/TradeModule/AssetSelector/AssetSelectorSingle.tsx @@ -1,9 +1,9 @@ import { useCallback } from 'react' -import { SwapIcon } from 'components/Icons' -import Text from 'components/Text' -import AssetButton from 'components/Trade/TradeModule/AssetSelector/AssetButton' -import AssetOverlay from 'components/Trade/TradeModule/AssetSelector/AssetOverlay' +import { SwapIcon } from 'components/common/Icons' +import Text from 'components/common/Text' +import AssetButton from 'components/trade/TradeModule/AssetSelector/AssetButton' +import AssetOverlay from 'components/trade/TradeModule/AssetSelector/AssetOverlay' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useMarketEnabledAssets from 'hooks/assets/useMarketEnabledAssets' diff --git a/src/components/Trade/TradeModule/AssetSelector/PairsList.tsx b/src/components/trade/TradeModule/AssetSelector/PairsList.tsx similarity index 95% rename from src/components/Trade/TradeModule/AssetSelector/PairsList.tsx rename to src/components/trade/TradeModule/AssetSelector/PairsList.tsx index 9b388bfc..107a5d4e 100644 --- a/src/components/Trade/TradeModule/AssetSelector/PairsList.tsx +++ b/src/components/trade/TradeModule/AssetSelector/PairsList.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' -import Text from 'components/Text' -import AssetSelectorItem from 'components/Trade/TradeModule/AssetSelector/AssetSelectorItem' +import Text from 'components/common/Text' +import AssetSelectorItem from 'components/trade/TradeModule/AssetSelector/AssetSelectorItem' import useBaseAsset from 'hooks/assets/useBasetAsset' import useMarketEnabledAssets from 'hooks/assets/useMarketEnabledAssets' import useMarketAssets from 'hooks/markets/useMarketAssets' diff --git a/src/components/Trade/TradeModule/SwapForm/AssetAmountInput.tsx b/src/components/trade/TradeModule/SwapForm/AssetAmountInput.tsx similarity index 94% rename from src/components/Trade/TradeModule/SwapForm/AssetAmountInput.tsx rename to src/components/trade/TradeModule/SwapForm/AssetAmountInput.tsx index 87a082c9..8bb496c3 100644 --- a/src/components/Trade/TradeModule/SwapForm/AssetAmountInput.tsx +++ b/src/components/trade/TradeModule/SwapForm/AssetAmountInput.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo } from 'react' -import DisplayCurrency from 'components/DisplayCurrency' -import NumberInput from 'components/NumberInput' +import DisplayCurrency from 'components/common/DisplayCurrency' +import NumberInput from 'components/common/NumberInput' import { BNCoin } from 'types/classes/BNCoin' interface Props { diff --git a/src/components/Trade/TradeModule/SwapForm/AutoRepayToggle.tsx b/src/components/trade/TradeModule/SwapForm/AutoRepayToggle.tsx similarity index 83% rename from src/components/Trade/TradeModule/SwapForm/AutoRepayToggle.tsx rename to src/components/trade/TradeModule/SwapForm/AutoRepayToggle.tsx index 399ab758..9d4f7741 100644 --- a/src/components/Trade/TradeModule/SwapForm/AutoRepayToggle.tsx +++ b/src/components/trade/TradeModule/SwapForm/AutoRepayToggle.tsx @@ -1,6 +1,6 @@ -import Switch from 'components/Switch' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Switch from 'components/common/Switch' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' interface Props { checked: boolean diff --git a/src/components/Trade/TradeModule/SwapForm/MarginToggle.tsx b/src/components/trade/TradeModule/SwapForm/MarginToggle.tsx similarity index 87% rename from src/components/Trade/TradeModule/SwapForm/MarginToggle.tsx rename to src/components/trade/TradeModule/SwapForm/MarginToggle.tsx index 4580ea3b..7f6349fd 100644 --- a/src/components/Trade/TradeModule/SwapForm/MarginToggle.tsx +++ b/src/components/trade/TradeModule/SwapForm/MarginToggle.tsx @@ -1,6 +1,6 @@ -import Switch from 'components/Switch' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' +import Switch from 'components/common/Switch' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' import ConditionalWrapper from 'hocs/ConditionalWrapper' interface Props { diff --git a/src/components/Trade/TradeModule/SwapForm/OrderTypeSelector/constants.ts b/src/components/trade/TradeModule/SwapForm/OrderTypeSelector/constants.ts similarity index 87% rename from src/components/Trade/TradeModule/SwapForm/OrderTypeSelector/constants.ts rename to src/components/trade/TradeModule/SwapForm/OrderTypeSelector/constants.ts index c7f93f3f..d4d64d12 100644 --- a/src/components/Trade/TradeModule/SwapForm/OrderTypeSelector/constants.ts +++ b/src/components/trade/TradeModule/SwapForm/OrderTypeSelector/constants.ts @@ -1,4 +1,4 @@ -import { OrderTab } from 'components/Trade/TradeModule/SwapForm/OrderTypeSelector/types' +import { OrderTab } from 'components/trade/TradeModule/SwapForm/OrderTypeSelector/types' const ORDER_TYPE_UNAVAILABLE_MESSAGE = 'This type of order is currently unavailable and is coming soon.' diff --git a/src/components/Trade/TradeModule/SwapForm/OrderTypeSelector/index.tsx b/src/components/trade/TradeModule/SwapForm/OrderTypeSelector/index.tsx similarity index 83% rename from src/components/Trade/TradeModule/SwapForm/OrderTypeSelector/index.tsx rename to src/components/trade/TradeModule/SwapForm/OrderTypeSelector/index.tsx index c5527818..31ce6239 100644 --- a/src/components/Trade/TradeModule/SwapForm/OrderTypeSelector/index.tsx +++ b/src/components/trade/TradeModule/SwapForm/OrderTypeSelector/index.tsx @@ -1,10 +1,10 @@ import classNames from 'classnames' -import { InfoCircle } from 'components/Icons' -import Text from 'components/Text' -import { Tooltip } from 'components/Tooltip' -import { ORDER_TYPE_TABS } from 'components/Trade/TradeModule/SwapForm/OrderTypeSelector/constants' -import { AvailableOrderType } from 'components/Trade/TradeModule/SwapForm/OrderTypeSelector/types' +import { InfoCircle } from 'components/common/Icons' +import Text from 'components/common/Text' +import { Tooltip } from 'components/common/Tooltip' +import { ORDER_TYPE_TABS } from 'components/trade/TradeModule/SwapForm/OrderTypeSelector/constants' +import { AvailableOrderType } from 'components/trade/TradeModule/SwapForm/OrderTypeSelector/types' import ConditionalWrapper from 'hocs/ConditionalWrapper' interface Props { diff --git a/src/components/Trade/TradeModule/SwapForm/OrderTypeSelector/types.ts b/src/components/trade/TradeModule/SwapForm/OrderTypeSelector/types.ts similarity index 100% rename from src/components/Trade/TradeModule/SwapForm/OrderTypeSelector/types.ts rename to src/components/trade/TradeModule/SwapForm/OrderTypeSelector/types.ts diff --git a/src/components/Trade/TradeModule/SwapForm/TradeSummary.tsx b/src/components/trade/TradeModule/SwapForm/TradeSummary.tsx similarity index 92% rename from src/components/Trade/TradeModule/SwapForm/TradeSummary.tsx rename to src/components/trade/TradeModule/SwapForm/TradeSummary.tsx index 1be62835..247cf1dc 100644 --- a/src/components/Trade/TradeModule/SwapForm/TradeSummary.tsx +++ b/src/components/trade/TradeModule/SwapForm/TradeSummary.tsx @@ -1,14 +1,14 @@ import classNames from 'classnames' import React, { useMemo } from 'react' -import ActionButton from 'components/Button/ActionButton' -import { CircularProgress } from 'components/CircularProgress' -import DisplayCurrency from 'components/DisplayCurrency' -import Divider from 'components/Divider' -import { FormattedNumber } from 'components/FormattedNumber' -import { ChevronDown } from 'components/Icons' -import SummaryLine from 'components/SummaryLine' -import Text from 'components/Text' +import ActionButton from 'components/common/Button/ActionButton' +import { CircularProgress } from 'components/common/CircularProgress' +import DisplayCurrency from 'components/common/DisplayCurrency' +import Divider from 'components/common/Divider' +import { FormattedNumber } from 'components/common/FormattedNumber' +import { ChevronDown } from 'components/common/Icons' +import SummaryLine from 'components/common/SummaryLine' +import Text from 'components/common/Text' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useAllAssets from 'hooks/assets/useAllAssets' diff --git a/src/components/Trade/TradeModule/SwapForm/index.tsx b/src/components/trade/TradeModule/SwapForm/index.tsx similarity index 94% rename from src/components/Trade/TradeModule/SwapForm/index.tsx rename to src/components/trade/TradeModule/SwapForm/index.tsx index b6fd395e..e5827cbc 100644 --- a/src/components/Trade/TradeModule/SwapForm/index.tsx +++ b/src/components/trade/TradeModule/SwapForm/index.tsx @@ -2,20 +2,20 @@ import debounce from 'lodash.debounce' import { useCallback, useEffect, useMemo, useState } from 'react' import estimateExactIn from 'api/swap/estimateExactIn' -import AvailableLiquidityMessage from 'components/AvailableLiquidityMessage' -import DepositCapMessage from 'components/DepositCapMessage' -import Divider from 'components/Divider' -import RangeInput from 'components/RangeInput' -import Text from 'components/Text' -import AssetSelectorPair from 'components/Trade/TradeModule/AssetSelector/AssetSelectorPair' -import AssetSelectorSingle from 'components/Trade/TradeModule/AssetSelector/AssetSelectorSingle' -import AssetAmountInput from 'components/Trade/TradeModule/SwapForm/AssetAmountInput' -import AutoRepayToggle from 'components/Trade/TradeModule/SwapForm/AutoRepayToggle' -import MarginToggle from 'components/Trade/TradeModule/SwapForm/MarginToggle' -import OrderTypeSelector from 'components/Trade/TradeModule/SwapForm/OrderTypeSelector' -import { AvailableOrderType } from 'components/Trade/TradeModule/SwapForm/OrderTypeSelector/types' -import TradeSummary from 'components/Trade/TradeModule/SwapForm/TradeSummary' -import { TradeDirectionSelector } from 'components/TradeDirectionSelector' +import AvailableLiquidityMessage from 'components/common/AvailableLiquidityMessage' +import DepositCapMessage from 'components/common/DepositCapMessage' +import Divider from 'components/common/Divider' +import LeverageSlider from 'components/common/LeverageSlider' +import Text from 'components/common/Text' +import { TradeDirectionSelector } from 'components/common/TradeDirectionSelector' +import AssetSelectorPair from 'components/trade/TradeModule/AssetSelector/AssetSelectorPair' +import AssetSelectorSingle from 'components/trade/TradeModule/AssetSelector/AssetSelectorSingle' +import AssetAmountInput from 'components/trade/TradeModule/SwapForm/AssetAmountInput' +import AutoRepayToggle from 'components/trade/TradeModule/SwapForm/AutoRepayToggle' +import MarginToggle from 'components/trade/TradeModule/SwapForm/MarginToggle' +import OrderTypeSelector from 'components/trade/TradeModule/SwapForm/OrderTypeSelector' +import { AvailableOrderType } from 'components/trade/TradeModule/SwapForm/OrderTypeSelector/types' +import TradeSummary from 'components/trade/TradeModule/SwapForm/TradeSummary' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import { BN_ZERO } from 'constants/math' @@ -393,11 +393,12 @@ export default function SwapForm(props: Props) { )} {!isAdvanced && } - diff --git a/src/pages/PerpsPage.tsx b/src/pages/PerpsPage.tsx index 12feb8af..10e6fec2 100644 --- a/src/pages/PerpsPage.tsx +++ b/src/pages/PerpsPage.tsx @@ -1,10 +1,10 @@ import { useSearchParams } from 'react-router-dom' -import { PerpsManageModule } from 'components/Perps/Module/PerpsManageModule' -import { PerpsModule } from 'components/Perps/Module/PerpsModule' -import { PerpsChart } from 'components/Perps/PerpsChart' -import { PerpsInfo } from 'components/Perps/PerpsInfo' -import { PerpsPositions } from 'components/Perps/PerpsPositions' +import { PerpsManageModule } from 'components/perps/Module/PerpsManageModule' +import { PerpsModule } from 'components/perps/Module/PerpsModule' +import { PerpsChart } from 'components/perps/PerpsChart' +import { PerpsInfo } from 'components/perps/PerpsInfo' +import { PerpsPositions } from 'components/perps/PerpsPositions' import { SearchParams } from 'types/enums/searchParams' export default function PerpsPage() { diff --git a/src/pages/PortfolioAccountPage.tsx b/src/pages/PortfolioAccountPage.tsx index 6759b276..abb6ffe1 100644 --- a/src/pages/PortfolioAccountPage.tsx +++ b/src/pages/PortfolioAccountPage.tsx @@ -1,10 +1,10 @@ import { useNavigate, useParams, useSearchParams } from 'react-router-dom' -import MigrationBanner from 'components/MigrationBanner' -import Balances from 'components/Portfolio/Account/Balances' -import BreadCrumbs from 'components/Portfolio/Account/BreadCrumbs' -import Summary from 'components/Portfolio/Account/Summary' -import ShareBar from 'components/ShareBar' +import MigrationBanner from 'components/common/MigrationBanner' +import Balances from 'components/portfolio/Account/Balances' +import BreadCrumbs from 'components/portfolio/Account/BreadCrumbs' +import Summary from 'components/portfolio/Account/Summary' +import ShareBar from 'components/common/ShareBar' import useAccountId from 'hooks/useAccountId' import { getRoute } from 'utils/route' diff --git a/src/pages/PortfolioPage.tsx b/src/pages/PortfolioPage.tsx index e39a71db..6e7269c2 100644 --- a/src/pages/PortfolioPage.tsx +++ b/src/pages/PortfolioPage.tsx @@ -1,8 +1,8 @@ -import MigrationBanner from 'components/MigrationBanner' -import AccountOverview from 'components/Portfolio/Overview' -import PortfolioSummary from 'components/Portfolio/Overview/Summary' -import PortfolioIntro from 'components/Portfolio/PortfolioIntro' -import ShareBar from 'components/ShareBar' +import MigrationBanner from 'components/common/MigrationBanner' +import AccountOverview from 'components/portfolio/Overview' +import PortfolioSummary from 'components/portfolio/Overview/Summary' +import PortfolioIntro from 'components/portfolio/PortfolioIntro' +import ShareBar from 'components/common/ShareBar' export default function PortfolioPage() { return ( diff --git a/src/pages/TradePage.tsx b/src/pages/TradePage.tsx index f7671a90..0a27a128 100644 --- a/src/pages/TradePage.tsx +++ b/src/pages/TradePage.tsx @@ -1,10 +1,10 @@ import { useMemo } from 'react' import { useLocation } from 'react-router-dom' -import MigrationBanner from 'components/MigrationBanner' -import AccountDetailsCard from 'components/Trade/AccountDetailsCard' -import TradeChart from 'components/Trade/TradeChart' -import TradeModule from 'components/Trade/TradeModule' +import MigrationBanner from 'components/common/MigrationBanner' +import AccountDetailsCard from 'components/trade/AccountDetailsCard' +import TradeChart from 'components/trade/TradeChart' +import TradeModule from 'components/trade/TradeModule' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useMarketEnabledAssets from 'hooks/assets/useMarketEnabledAssets' diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index e0426492..aae9d73d 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -1,7 +1,7 @@ import { AppProps } from 'next/app' import { useEffect, useState } from 'react' -import DefaultPageHead from 'components/DefaultPageHead' +import DefaultPageHead from 'components/common/DefaultPageHead' import init from 'utils/health_computer' import 'react-toastify/dist/ReactToastify.min.css' diff --git a/src/pages/_layout.tsx b/src/pages/_layout.tsx index b5add2a4..82f212aa 100644 --- a/src/pages/_layout.tsx +++ b/src/pages/_layout.tsx @@ -3,13 +3,13 @@ import { Suspense } from 'react' import { isMobile } from 'react-device-detect' import { useLocation } from 'react-router-dom' -import AccountDetails from 'components/Account/AccountDetails' -import Background from 'components/Background' -import Footer from 'components/Footer' -import DesktopHeader from 'components/Header/DesktopHeader' +import AccountDetails from 'components/account/AccountDetails' +import Background from 'components/common/Background' +import Footer from 'components/common/Footer' +import DesktopHeader from 'components/header/DesktopHeader' import ModalsContainer from 'components/Modals/ModalsContainer' -import PageMetadata from 'components/PageMetadata' -import Toaster from 'components/Toaster' +import PageMetadata from 'components/common/PageMetadata' +import Toaster from 'components/common/Toaster' import { DEFAULT_SETTINGS } from 'constants/defaultSettings' import { LocalStorageKeys } from 'constants/localStorageKeys' import useLocalStorage from 'hooks/localStorage/useLocalStorage' diff --git a/src/pages/index.tsx b/src/pages/index.tsx index ff7df7c7..2f9a970c 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,7 +1,7 @@ import React from 'react' import { BrowserRouter } from 'react-router-dom' -import Routes from 'components/Routes' +import Routes from 'components/header/navigation/Routes' import { WalletConnectProvider } from 'components/Wallet/WalletConnectProvider' export default function Router() { diff --git a/tailwind.config.js b/tailwind.config.js index 58e0561f..b9c690ff 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -399,6 +399,16 @@ module.exports = { '.gradient-slider-4': { background: 'linear-gradient(to right, #961293, #B3419B)', }, + '.gradient-slider-pink': { + background: + 'linear-gradient(270deg, rgba(255, 97, 141, 0.89) 0%, rgba(66, 58, 70, 0.05) 100%)', + }, + '.gradient-slider-green': { + background: 'linear-gradient(270deg, #61FF71E2 0%, #423A460D 100%)', + }, + '.gradient-slider-red': { + background: 'linear-gradient(270deg, #F04438E2 0%, #423A460D 100%)', + }, '.gradient-tooltip': { background: 'linear-gradient(77.47deg, rgba(20, 24, 57, 0.9) 11.58%, rgba(34, 16, 57, 0.9) 93.89%)',