diff --git a/src/components/Modals/Accounts/TxHistory/index.module.scss b/src/components/Accounts/TxHistory/index.module.scss similarity index 100% rename from src/components/Modals/Accounts/TxHistory/index.module.scss rename to src/components/Accounts/TxHistory/index.module.scss diff --git a/src/components/Modals/Accounts/TxHistory/index.tsx b/src/components/Accounts/TxHistory/index.tsx similarity index 100% rename from src/components/Modals/Accounts/TxHistory/index.tsx rename to src/components/Accounts/TxHistory/index.tsx diff --git a/src/components/Modals/Accounts/index.ts b/src/components/Accounts/index.ts similarity index 100% rename from src/components/Modals/Accounts/index.ts rename to src/components/Accounts/index.ts diff --git a/src/components/Charts/index.ts b/src/components/Charts/index.ts deleted file mode 100644 index 4b693dc5..00000000 --- a/src/components/Charts/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './SalePrice'; diff --git a/src/components/Elements/Selectors/NetworkSelector/index.tsx b/src/components/Elements/Selectors/NetworkSelector/index.tsx index e1526ded..9b966293 100644 --- a/src/components/Elements/Selectors/NetworkSelector/index.tsx +++ b/src/components/Elements/Selectors/NetworkSelector/index.tsx @@ -9,7 +9,7 @@ import { import { useNetwork } from '@/contexts/network'; import { NetworkType } from '@/models'; -const RelaySelect = () => { +export const NetworkSelector = () => { const router = useRouter(); const { network } = useNetwork(); @@ -84,5 +84,3 @@ const RelaySelect = () => { ); }; - -export default RelaySelect; diff --git a/src/components/Elements/Selectors/index.ts b/src/components/Elements/Selectors/index.ts index 1ace844e..c89f58ff 100644 --- a/src/components/Elements/Selectors/index.ts +++ b/src/components/Elements/Selectors/index.ts @@ -1,4 +1,5 @@ export * from './AssetSelector'; export * from './ChainSelector'; export * from './FinalitySelector'; +export * from './NetworkSelector'; export * from './RegionSelector'; diff --git a/src/components/Header/index.module.scss b/src/components/Layout/Header/index.module.scss similarity index 100% rename from src/components/Header/index.module.scss rename to src/components/Layout/Header/index.module.scss diff --git a/src/components/Header/index.tsx b/src/components/Layout/Header/index.tsx similarity index 96% rename from src/components/Header/index.tsx rename to src/components/Layout/Header/index.tsx index fe139b1d..773bd7c1 100644 --- a/src/components/Header/index.tsx +++ b/src/components/Layout/Header/index.tsx @@ -12,12 +12,16 @@ import { } from '@mui/material'; import React, { useState } from 'react'; +import { + Address, + NetworkSelector, + ProgressButton, + TxHistoryModal, +} from '@/components'; + import { KeyringState, useAccounts } from '@/contexts/account'; import styles from './index.module.scss'; -import { Address, ProgressButton } from '../Elements'; -import NetworkSelector from '../Elements/Selectors/NetworkSelector'; -import { TxHistoryModal } from '../Modals/Accounts'; export const Header = () => { const theme = useTheme(); diff --git a/src/components/Sidebar/index.module.scss b/src/components/Layout/Sidebar/index.module.scss similarity index 100% rename from src/components/Sidebar/index.module.scss rename to src/components/Layout/Sidebar/index.module.scss diff --git a/src/components/Sidebar/index.tsx b/src/components/Layout/Sidebar/index.tsx similarity index 99% rename from src/components/Sidebar/index.tsx rename to src/components/Layout/Sidebar/index.tsx index 436977f2..b986e24c 100644 --- a/src/components/Sidebar/index.tsx +++ b/src/components/Layout/Sidebar/index.tsx @@ -21,7 +21,7 @@ import { useNetwork } from '@/contexts/network'; import { RenewIcon } from '@/icons'; import styles from './index.module.scss'; -import { StatusIndicator } from '../Elements'; +import { StatusIndicator } from '../../Elements'; interface MenuItemProps { label: string; diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx index 42e81386..e10d7fd8 100644 --- a/src/components/Layout/index.tsx +++ b/src/components/Layout/index.tsx @@ -1,8 +1,8 @@ import React, { ReactElement } from 'react'; +import { Header } from './Header'; import styles from './index.module.scss'; -import { Header } from '../Header'; -import { Sidebar } from '../Sidebar'; +import { Sidebar } from './Sidebar'; interface Props { children: ReactElement | ReactElement[]; diff --git a/src/components/Modals/index.ts b/src/components/Modals/index.ts deleted file mode 100644 index b5194c70..00000000 --- a/src/components/Modals/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './Orders'; -export * from './Paras'; -export * from './Regions'; -export * from './SaleDetails'; diff --git a/src/components/Modals/Orders/Contribution/index.module.scss b/src/components/Orders/Modals/Contribution/index.module.scss similarity index 100% rename from src/components/Modals/Orders/Contribution/index.module.scss rename to src/components/Orders/Modals/Contribution/index.module.scss diff --git a/src/components/Modals/Orders/Contribution/index.tsx b/src/components/Orders/Modals/Contribution/index.tsx similarity index 100% rename from src/components/Modals/Orders/Contribution/index.tsx rename to src/components/Orders/Modals/Contribution/index.tsx diff --git a/src/components/Modals/Orders/OrderCreation/index.module.scss b/src/components/Orders/Modals/OrderCreation/index.module.scss similarity index 100% rename from src/components/Modals/Orders/OrderCreation/index.module.scss rename to src/components/Orders/Modals/OrderCreation/index.module.scss diff --git a/src/components/Modals/Orders/OrderCreation/index.tsx b/src/components/Orders/Modals/OrderCreation/index.tsx similarity index 100% rename from src/components/Modals/Orders/OrderCreation/index.tsx rename to src/components/Orders/Modals/OrderCreation/index.tsx diff --git a/src/components/Modals/Orders/index.ts b/src/components/Orders/Modals/index.ts similarity index 100% rename from src/components/Modals/Orders/index.ts rename to src/components/Orders/Modals/index.ts diff --git a/src/components/Orders/index.ts b/src/components/Orders/index.ts index 38177335..5a4890b1 100644 --- a/src/components/Orders/index.ts +++ b/src/components/Orders/index.ts @@ -1 +1,2 @@ +export * from './Modals'; export * from './OrderCard'; diff --git a/src/components/Panels/SaleInfoPanel/index.tsx b/src/components/Panels/SaleInfoPanel/index.tsx index 316d1b21..ecac8ee6 100644 --- a/src/components/Panels/SaleInfoPanel/index.tsx +++ b/src/components/Panels/SaleInfoPanel/index.tsx @@ -5,8 +5,7 @@ import { useState } from 'react'; import { getBalanceString, getTimeStringShort } from '@/utils/functions'; -import { SalePhaseCard } from '@/components/Elements'; -import { PriceModal } from '@/components/Modals'; +import { PriceModal, SalePhaseCard } from '@/components'; import DollarIcon from '@/assets/dollar.png'; import ListIcon from '@/assets/list.png'; diff --git a/src/components/Panels/SalePhaseInfoPanel/index.tsx b/src/components/Panels/SalePhaseInfoPanel/index.tsx index d935d2c5..3b48c706 100644 --- a/src/components/Panels/SalePhaseInfoPanel/index.tsx +++ b/src/components/Panels/SalePhaseInfoPanel/index.tsx @@ -1,8 +1,7 @@ import { Box, Button, Paper, Typography, useTheme } from '@mui/material'; import { useEffect, useState } from 'react'; -import { CountDown, SalePhaseCard } from '@/components/Elements'; -import { PurchaseHistoryModal } from '@/components/Modals'; +import { CountDown, PurchaseHistoryModal, SalePhaseCard } from '@/components'; import { useSaleInfo } from '@/contexts/sales'; import { SalePhase } from '@/models'; diff --git a/src/components/Modals/Paras/Register/index.module.scss b/src/components/Paras/Modals/Register/index.module.scss similarity index 100% rename from src/components/Modals/Paras/Register/index.module.scss rename to src/components/Paras/Modals/Register/index.module.scss diff --git a/src/components/Modals/Paras/Register/index.tsx b/src/components/Paras/Modals/Register/index.tsx similarity index 100% rename from src/components/Modals/Paras/Register/index.tsx rename to src/components/Paras/Modals/Register/index.tsx diff --git a/src/components/Modals/Paras/Reserve/index.module.scss b/src/components/Paras/Modals/Reserve/index.module.scss similarity index 100% rename from src/components/Modals/Paras/Reserve/index.module.scss rename to src/components/Paras/Modals/Reserve/index.module.scss diff --git a/src/components/Modals/Paras/Reserve/index.tsx b/src/components/Paras/Modals/Reserve/index.tsx similarity index 100% rename from src/components/Modals/Paras/Reserve/index.tsx rename to src/components/Paras/Modals/Reserve/index.tsx diff --git a/src/components/Modals/Paras/index.ts b/src/components/Paras/Modals/index.ts similarity index 100% rename from src/components/Modals/Paras/index.ts rename to src/components/Paras/Modals/index.ts diff --git a/src/components/Paras/index.ts b/src/components/Paras/index.ts index cbde26a3..1f856478 100644 --- a/src/components/Paras/index.ts +++ b/src/components/Paras/index.ts @@ -1,4 +1,5 @@ export * from './CoreExpiryCard'; export * from './LeaseStateCard'; +export * from './Modals'; export * from './ParaDisplay'; export * from './ParaStateCard'; diff --git a/src/components/Modals/Regions/AddTask/index.module.scss b/src/components/Regions/Modals/AddTask/index.module.scss similarity index 100% rename from src/components/Modals/Regions/AddTask/index.module.scss rename to src/components/Regions/Modals/AddTask/index.module.scss diff --git a/src/components/Modals/Regions/AddTask/index.tsx b/src/components/Regions/Modals/AddTask/index.tsx similarity index 100% rename from src/components/Modals/Regions/AddTask/index.tsx rename to src/components/Regions/Modals/AddTask/index.tsx diff --git a/src/components/Modals/Regions/Interlace/index.module.scss b/src/components/Regions/Modals/Interlace/index.module.scss similarity index 100% rename from src/components/Modals/Regions/Interlace/index.module.scss rename to src/components/Regions/Modals/Interlace/index.module.scss diff --git a/src/components/Modals/Regions/Interlace/index.tsx b/src/components/Regions/Modals/Interlace/index.tsx similarity index 100% rename from src/components/Modals/Regions/Interlace/index.tsx rename to src/components/Regions/Modals/Interlace/index.tsx diff --git a/src/components/Modals/Regions/Partition/index.module.scss b/src/components/Regions/Modals/Partition/index.module.scss similarity index 100% rename from src/components/Modals/Regions/Partition/index.module.scss rename to src/components/Regions/Modals/Partition/index.module.scss diff --git a/src/components/Modals/Regions/Partition/index.tsx b/src/components/Regions/Modals/Partition/index.tsx similarity index 100% rename from src/components/Modals/Regions/Partition/index.tsx rename to src/components/Regions/Modals/Partition/index.tsx diff --git a/src/components/Modals/Regions/Pooling/index.module.scss b/src/components/Regions/Modals/Pooling/index.module.scss similarity index 100% rename from src/components/Modals/Regions/Pooling/index.module.scss rename to src/components/Regions/Modals/Pooling/index.module.scss diff --git a/src/components/Modals/Regions/Pooling/index.tsx b/src/components/Regions/Modals/Pooling/index.tsx similarity index 100% rename from src/components/Modals/Regions/Pooling/index.tsx rename to src/components/Regions/Modals/Pooling/index.tsx diff --git a/src/components/Modals/Regions/Price/index.module.scss b/src/components/Regions/Modals/Price/index.module.scss similarity index 100% rename from src/components/Modals/Regions/Price/index.module.scss rename to src/components/Regions/Modals/Price/index.module.scss diff --git a/src/components/Modals/Regions/Price/index.tsx b/src/components/Regions/Modals/Price/index.tsx similarity index 93% rename from src/components/Modals/Regions/Price/index.tsx rename to src/components/Regions/Modals/Price/index.tsx index be1c456e..65ef0f98 100644 --- a/src/components/Modals/Regions/Price/index.tsx +++ b/src/components/Regions/Modals/Price/index.tsx @@ -9,8 +9,7 @@ import { useTheme, } from '@mui/material'; -import { SalePriceChart } from '@/components/Charts'; -import { ActionButton, CountDown } from '@/components/Elements'; +import { ActionButton, CountDown, SalePriceChart } from '@/components'; import { useSaleInfo } from '@/contexts/sales'; import { SalePhase } from '@/models'; diff --git a/src/components/Modals/Regions/Purchase/index.tsx b/src/components/Regions/Modals/Purchase/index.tsx similarity index 100% rename from src/components/Modals/Regions/Purchase/index.tsx rename to src/components/Regions/Modals/Purchase/index.tsx diff --git a/src/components/Modals/Regions/PurchaseHistory/index.module.scss b/src/components/Regions/Modals/PurchaseHistory/index.module.scss similarity index 100% rename from src/components/Modals/Regions/PurchaseHistory/index.module.scss rename to src/components/Regions/Modals/PurchaseHistory/index.module.scss diff --git a/src/components/Modals/Regions/PurchaseHistory/index.tsx b/src/components/Regions/Modals/PurchaseHistory/index.tsx similarity index 100% rename from src/components/Modals/Regions/PurchaseHistory/index.tsx rename to src/components/Regions/Modals/PurchaseHistory/index.tsx diff --git a/src/components/Modals/Regions/Sell/index.module.scss b/src/components/Regions/Modals/Sell/index.module.scss similarity index 100% rename from src/components/Modals/Regions/Sell/index.module.scss rename to src/components/Regions/Modals/Sell/index.module.scss diff --git a/src/components/Modals/Regions/Sell/index.tsx b/src/components/Regions/Modals/Sell/index.tsx similarity index 100% rename from src/components/Modals/Regions/Sell/index.tsx rename to src/components/Regions/Modals/Sell/index.tsx diff --git a/src/components/Modals/Regions/TaskAssign/index.module.scss b/src/components/Regions/Modals/TaskAssign/index.module.scss similarity index 100% rename from src/components/Modals/Regions/TaskAssign/index.module.scss rename to src/components/Regions/Modals/TaskAssign/index.module.scss diff --git a/src/components/Modals/Regions/TaskAssign/index.tsx b/src/components/Regions/Modals/TaskAssign/index.tsx similarity index 100% rename from src/components/Modals/Regions/TaskAssign/index.tsx rename to src/components/Regions/Modals/TaskAssign/index.tsx diff --git a/src/components/Modals/Regions/Transfer/index.module.scss b/src/components/Regions/Modals/Transfer/index.module.scss similarity index 100% rename from src/components/Modals/Regions/Transfer/index.module.scss rename to src/components/Regions/Modals/Transfer/index.module.scss diff --git a/src/components/Modals/Regions/Transfer/index.tsx b/src/components/Regions/Modals/Transfer/index.tsx similarity index 100% rename from src/components/Modals/Regions/Transfer/index.tsx rename to src/components/Regions/Modals/Transfer/index.tsx diff --git a/src/components/Modals/Regions/index.ts b/src/components/Regions/Modals/index.ts similarity index 100% rename from src/components/Modals/Regions/index.ts rename to src/components/Regions/Modals/index.ts diff --git a/src/components/Regions/index.ts b/src/components/Regions/index.ts index e13bdb59..82604eca 100644 --- a/src/components/Regions/index.ts +++ b/src/components/Regions/index.ts @@ -1,4 +1,5 @@ export * from './IsmpRegionCard'; export * from './MarketRegion'; +export * from './Modals'; export * from './RegionMetaCard'; export * from './RegionOverview'; diff --git a/src/components/Modals/SaleDetails/index.module.scss b/src/components/Sales/SaleDetails/index.module.scss similarity index 100% rename from src/components/Modals/SaleDetails/index.module.scss rename to src/components/Sales/SaleDetails/index.module.scss diff --git a/src/components/Modals/SaleDetails/index.tsx b/src/components/Sales/SaleDetails/index.tsx similarity index 100% rename from src/components/Modals/SaleDetails/index.tsx rename to src/components/Sales/SaleDetails/index.tsx diff --git a/src/components/Charts/SalePrice/index.tsx b/src/components/Sales/SalePrice/index.tsx similarity index 100% rename from src/components/Charts/SalePrice/index.tsx rename to src/components/Sales/SalePrice/index.tsx diff --git a/src/components/Sales/index.ts b/src/components/Sales/index.ts new file mode 100644 index 00000000..a4a37f69 --- /dev/null +++ b/src/components/Sales/index.ts @@ -0,0 +1,2 @@ +export * from './SaleDetails'; +export * from './SalePrice'; diff --git a/src/components/Tables/SalesHistoryTable/index.tsx b/src/components/Tables/SalesHistoryTable/index.tsx index 728ae6d2..446c23b0 100644 --- a/src/components/Tables/SalesHistoryTable/index.tsx +++ b/src/components/Tables/SalesHistoryTable/index.tsx @@ -14,10 +14,11 @@ import { useState } from 'react'; import { getTimeStringLong } from '@/utils/functions'; +import { SaleDetailsModal } from '@/components'; + import { SalesHistoryItem } from '@/models'; import { StyledTableCell, StyledTableRow } from '../common'; -import { SaleDetailsModal } from '../../Modals'; interface SalesHistoryTableProps { data: SalesHistoryItem[]; diff --git a/src/components/index.ts b/src/components/index.ts index 093b9edf..0b91d4da 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,12 +1,10 @@ -export * from './Charts'; +export * from './Accounts'; export * from './Elements'; -export * from './Header'; export * from './Layout'; export * from './Market'; -export * from './Modals'; export * from './Orders'; export * from './Panels'; export * from './Paras'; export * from './Regions'; -export * from './Sidebar'; +export * from './Sales'; export * from './Tables';