From 956a26d1810a58c00a335ad71704a000d131933e Mon Sep 17 00:00:00 2001 From: binarybaron Date: Sun, 18 Aug 2024 19:31:45 +0200 Subject: [PATCH] refactor(gui): Reorganize imports --- src-gui/src/renderer/components/App.tsx | 8 ++++---- .../renderer/components/navigation/Navigation.tsx | 4 ++-- .../components/navigation/NavigationFooter.tsx | 14 +++++++------- .../components/navigation/NavigationHeader.tsx | 4 ++-- .../navigation/RouteListItemIconButton.tsx | 2 +- .../components/other/ExpandableSearchBox.tsx | 4 ++-- .../src/renderer/components/other/JSONViewTree.tsx | 4 ++-- .../renderer/components/other/LoadingButton.tsx | 2 +- .../renderer/components/other/RenderedCliLog.tsx | 2 +- .../components/pages/help/DonateInfoBox.tsx | 2 +- .../components/pages/help/FeedbackInfoBox.tsx | 2 +- .../renderer/components/pages/help/HelpPage.tsx | 4 ++-- .../components/pages/help/RpcControlBox.tsx | 8 ++++---- .../renderer/components/pages/help/TorInfoBox.tsx | 4 ++-- .../components/pages/history/HistoryPage.tsx | 4 ++-- .../renderer/components/pages/swap/SwapPage.tsx | 2 +- .../components/pages/wallet/WithdrawWidget.tsx | 8 ++++---- .../components/snackbar/GlobalSnackbarProvider.tsx | 4 ++-- src-gui/src/renderer/index.tsx | 8 ++++---- src-gui/src/store/combinedReducer.ts | 8 ++++---- src-gui/src/store/hooks.ts | 2 +- src-gui/vite.config.ts | 2 +- 22 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src-gui/src/renderer/components/App.tsx b/src-gui/src/renderer/components/App.tsx index dee26c50..0123e202 100644 --- a/src-gui/src/renderer/components/App.tsx +++ b/src-gui/src/renderer/components/App.tsx @@ -1,12 +1,12 @@ -import { Box, makeStyles, CssBaseline } from "@material-ui/core"; -import { createTheme, ThemeProvider } from "@material-ui/core/styles"; +import { Box, CssBaseline, makeStyles } from "@material-ui/core"; import { indigo } from "@material-ui/core/colors"; -import { MemoryRouter as Router, Routes, Route } from "react-router-dom"; +import { createTheme, ThemeProvider } from "@material-ui/core/styles"; +import { Route, MemoryRouter as Router, Routes } from "react-router-dom"; import Navigation, { drawerWidth } from "./navigation/Navigation"; +import HelpPage from "./pages/help/HelpPage"; import HistoryPage from "./pages/history/HistoryPage"; import SwapPage from "./pages/swap/SwapPage"; import WalletPage from "./pages/wallet/WalletPage"; -import HelpPage from "./pages/help/HelpPage"; import GlobalSnackbarProvider from "./snackbar/GlobalSnackbarProvider"; const useStyles = makeStyles((theme) => ({ diff --git a/src-gui/src/renderer/components/navigation/Navigation.tsx b/src-gui/src/renderer/components/navigation/Navigation.tsx index 5a8bc344..2e9c1c94 100644 --- a/src-gui/src/renderer/components/navigation/Navigation.tsx +++ b/src-gui/src/renderer/components/navigation/Navigation.tsx @@ -1,6 +1,6 @@ -import { Drawer, makeStyles, Box } from "@material-ui/core"; -import NavigationHeader from "./NavigationHeader"; +import { Box, Drawer, makeStyles } from "@material-ui/core"; import NavigationFooter from "./NavigationFooter"; +import NavigationHeader from "./NavigationHeader"; export const drawerWidth = 240; diff --git a/src-gui/src/renderer/components/navigation/NavigationFooter.tsx b/src-gui/src/renderer/components/navigation/NavigationFooter.tsx index a8612a9b..e4d7f1c1 100644 --- a/src-gui/src/renderer/components/navigation/NavigationFooter.tsx +++ b/src-gui/src/renderer/components/navigation/NavigationFooter.tsx @@ -1,13 +1,13 @@ -import RedditIcon from "@material-ui/icons/Reddit"; -import GitHubIcon from "@material-ui/icons/GitHub"; import { Box, makeStyles } from "@material-ui/core"; -import LinkIconButton from "../icons/LinkIconButton"; -import UnfinishedSwapsAlert from "../alert/UnfinishedSwapsAlert"; +import GitHubIcon from "@material-ui/icons/GitHub"; +import RedditIcon from "@material-ui/icons/Reddit"; import FundsLeftInWalletAlert from "../alert/FundsLeftInWalletAlert"; -import RpcStatusAlert from "../alert/RpcStatusAlert"; -import DiscordIcon from "../icons/DiscordIcon"; -import { DISCORD_URL } from "../pages/help/ContactInfoBox"; import MoneroWalletRpcUpdatingAlert from "../alert/MoneroWalletRpcUpdatingAlert"; +import RpcStatusAlert from "../alert/RpcStatusAlert"; +import UnfinishedSwapsAlert from "../alert/UnfinishedSwapsAlert"; +import DiscordIcon from "../icons/DiscordIcon"; +import LinkIconButton from "../icons/LinkIconButton"; +import { DISCORD_URL } from "../pages/help/ContactInfoBox"; const useStyles = makeStyles((theme) => ({ outer: { diff --git a/src-gui/src/renderer/components/navigation/NavigationHeader.tsx b/src-gui/src/renderer/components/navigation/NavigationHeader.tsx index ae18c02c..848633e5 100644 --- a/src-gui/src/renderer/components/navigation/NavigationHeader.tsx +++ b/src-gui/src/renderer/components/navigation/NavigationHeader.tsx @@ -1,8 +1,8 @@ import { Box, List } from "@material-ui/core"; -import SwapHorizOutlinedIcon from "@material-ui/icons/SwapHorizOutlined"; -import HistoryOutlinedIcon from "@material-ui/icons/HistoryOutlined"; import AccountBalanceWalletIcon from "@material-ui/icons/AccountBalanceWallet"; import HelpOutlineIcon from "@material-ui/icons/HelpOutline"; +import HistoryOutlinedIcon from "@material-ui/icons/HistoryOutlined"; +import SwapHorizOutlinedIcon from "@material-ui/icons/SwapHorizOutlined"; import RouteListItemIconButton from "./RouteListItemIconButton"; import UnfinishedSwapsBadge from "./UnfinishedSwapsCountBadge"; diff --git a/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx b/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx index a9a3e2ac..0df64d8b 100644 --- a/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx +++ b/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx @@ -1,6 +1,6 @@ +import { ListItem, ListItemIcon, ListItemText } from "@material-ui/core"; import { ReactNode } from "react"; import { useNavigate } from "react-router-dom"; -import { ListItem, ListItemIcon, ListItemText } from "@material-ui/core"; export default function RouteListItemIconButton({ name, diff --git a/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx b/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx index 0afaf5ff..c8be7663 100644 --- a/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx +++ b/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx @@ -1,7 +1,7 @@ -import { useState } from "react"; import { Box, IconButton, TextField } from "@material-ui/core"; -import SearchIcon from "@material-ui/icons/Search"; import CloseIcon from "@material-ui/icons/Close"; +import SearchIcon from "@material-ui/icons/Search"; +import { useState } from "react"; export function ExpandableSearchBox({ query, diff --git a/src-gui/src/renderer/components/other/JSONViewTree.tsx b/src-gui/src/renderer/components/other/JSONViewTree.tsx index f2aa6763..87cf63b5 100644 --- a/src-gui/src/renderer/components/other/JSONViewTree.tsx +++ b/src-gui/src/renderer/components/other/JSONViewTree.tsx @@ -1,7 +1,7 @@ -import TreeView from "@material-ui/lab/TreeView"; -import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; import ChevronRightIcon from "@material-ui/icons/ChevronRight"; +import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; import TreeItem from "@material-ui/lab/TreeItem"; +import TreeView from "@material-ui/lab/TreeView"; import ScrollablePaperTextBox from "./ScrollablePaperTextBox"; interface JsonTreeViewProps { diff --git a/src-gui/src/renderer/components/other/LoadingButton.tsx b/src-gui/src/renderer/components/other/LoadingButton.tsx index 480e3fd1..beb13da8 100644 --- a/src-gui/src/renderer/components/other/LoadingButton.tsx +++ b/src-gui/src/renderer/components/other/LoadingButton.tsx @@ -1,6 +1,6 @@ -import React from "react"; import Button, { ButtonProps } from "@material-ui/core/Button"; import CircularProgress from "@material-ui/core/CircularProgress"; +import React from "react"; interface LoadingButtonProps extends ButtonProps { loading: boolean; diff --git a/src-gui/src/renderer/components/other/RenderedCliLog.tsx b/src-gui/src/renderer/components/other/RenderedCliLog.tsx index ab91ea8f..50e4bf9f 100644 --- a/src-gui/src/renderer/components/other/RenderedCliLog.tsx +++ b/src-gui/src/renderer/components/other/RenderedCliLog.tsx @@ -1,6 +1,6 @@ import { Box, Chip, Typography } from "@material-ui/core"; -import { useMemo, useState } from "react"; import { CliLog } from "models/cliModel"; +import { useMemo, useState } from "react"; import { logsToRawString } from "utils/parseUtils"; import ScrollablePaperTextBox from "./ScrollablePaperTextBox"; diff --git a/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx b/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx index 9e453801..b87de9cc 100644 --- a/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx +++ b/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx @@ -1,6 +1,6 @@ import { Typography } from "@material-ui/core"; -import DepositAddressInfoBox from "../../modal/swap/DepositAddressInfoBox"; import MoneroIcon from "../../icons/MoneroIcon"; +import DepositAddressInfoBox from "../../modal/swap/DepositAddressInfoBox"; const XMR_DONATE_ADDRESS = "87jS4C7ngk9EHdqFFuxGFgg8AyH63dRUoULshWDybFJaP75UA89qsutG5B1L1QTc4w228nsqsv8EjhL7bz8fB3611Mh98mg"; diff --git a/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx b/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx index faea798e..19614337 100644 --- a/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx +++ b/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx @@ -1,7 +1,7 @@ import { Button, Typography } from "@material-ui/core"; import { useState } from "react"; -import InfoBox from "../../modal/swap/InfoBox"; import FeedbackDialog from "../../modal/feedback/FeedbackDialog"; +import InfoBox from "../../modal/swap/InfoBox"; export default function FeedbackInfoBox() { const [showDialog, setShowDialog] = useState(false); diff --git a/src-gui/src/renderer/components/pages/help/HelpPage.tsx b/src-gui/src/renderer/components/pages/help/HelpPage.tsx index b0dc6720..bdce7292 100644 --- a/src-gui/src/renderer/components/pages/help/HelpPage.tsx +++ b/src-gui/src/renderer/components/pages/help/HelpPage.tsx @@ -1,9 +1,9 @@ import { Box, makeStyles } from "@material-ui/core"; import ContactInfoBox from "./ContactInfoBox"; -import FeedbackInfoBox from "./FeedbackInfoBox"; import DonateInfoBox from "./DonateInfoBox"; -import TorInfoBox from "./TorInfoBox"; +import FeedbackInfoBox from "./FeedbackInfoBox"; import RpcControlBox from "./RpcControlBox"; +import TorInfoBox from "./TorInfoBox"; const useStyles = makeStyles((theme) => ({ outer: { diff --git a/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx b/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx index 3ae2a3de..1d36922d 100644 --- a/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx +++ b/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx @@ -1,12 +1,12 @@ import { Box, makeStyles } from "@material-ui/core"; +import FolderOpenIcon from "@material-ui/icons/FolderOpen"; +import PlayArrowIcon from "@material-ui/icons/PlayArrow"; +import StopIcon from "@material-ui/icons/Stop"; +import { RpcProcessStateType } from "models/rpcModel"; import IpcInvokeButton from "renderer/components/IpcInvokeButton"; import { useAppSelector } from "store/hooks"; -import StopIcon from "@material-ui/icons/Stop"; -import PlayArrowIcon from "@material-ui/icons/PlayArrow"; -import { RpcProcessStateType } from "models/rpcModel"; import InfoBox from "../../modal/swap/InfoBox"; import CliLogsBox from "../../other/RenderedCliLog"; -import FolderOpenIcon from "@material-ui/icons/FolderOpen"; const useStyles = makeStyles((theme) => ({ actionsOuter: { diff --git a/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx b/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx index 6e9c992d..c4ef58e4 100644 --- a/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx +++ b/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx @@ -1,8 +1,8 @@ import { Box, makeStyles, Typography } from "@material-ui/core"; +import PlayArrowIcon from "@material-ui/icons/PlayArrow"; +import StopIcon from "@material-ui/icons/Stop"; import IpcInvokeButton from "renderer/components/IpcInvokeButton"; import { useAppSelector } from "store/hooks"; -import StopIcon from "@material-ui/icons/Stop"; -import PlayArrowIcon from "@material-ui/icons/PlayArrow"; import InfoBox from "../../modal/swap/InfoBox"; import CliLogsBox from "../../other/RenderedCliLog"; diff --git a/src-gui/src/renderer/components/pages/history/HistoryPage.tsx b/src-gui/src/renderer/components/pages/history/HistoryPage.tsx index 15170d70..d4ec82d8 100644 --- a/src-gui/src/renderer/components/pages/history/HistoryPage.tsx +++ b/src-gui/src/renderer/components/pages/history/HistoryPage.tsx @@ -1,8 +1,8 @@ import { Typography } from "@material-ui/core"; import { useIsSwapRunning } from "store/hooks"; -import HistoryTable from "./table/HistoryTable"; -import SwapDialog from "../../modal/swap/SwapDialog"; import SwapTxLockAlertsBox from "../../alert/SwapTxLockAlertsBox"; +import SwapDialog from "../../modal/swap/SwapDialog"; +import HistoryTable from "./table/HistoryTable"; export default function HistoryPage() { const showDialog = useIsSwapRunning(); diff --git a/src-gui/src/renderer/components/pages/swap/SwapPage.tsx b/src-gui/src/renderer/components/pages/swap/SwapPage.tsx index d60cadd6..bb3da695 100644 --- a/src-gui/src/renderer/components/pages/swap/SwapPage.tsx +++ b/src-gui/src/renderer/components/pages/swap/SwapPage.tsx @@ -1,6 +1,6 @@ import { Box, makeStyles } from "@material-ui/core"; -import SwapWidget from "./SwapWidget"; import ApiAlertsBox from "./ApiAlertsBox"; +import SwapWidget from "./SwapWidget"; const useStyles = makeStyles((theme) => ({ outer: { diff --git a/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx b/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx index c43705d9..6cbcf9f9 100644 --- a/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx +++ b/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx @@ -1,13 +1,13 @@ import { Box, Button, makeStyles, Typography } from "@material-ui/core"; -import { useState } from "react"; import SendIcon from "@material-ui/icons/Send"; -import { useAppSelector, useIsRpcEndpointBusy } from "store/hooks"; import { RpcMethod } from "models/rpcModel"; +import { useState } from "react"; +import { SatsAmount } from "renderer/components/other/Units"; +import { useAppSelector, useIsRpcEndpointBusy } from "store/hooks"; import BitcoinIcon from "../../icons/BitcoinIcon"; +import InfoBox from "../../modal/swap/InfoBox"; import WithdrawDialog from "../../modal/wallet/WithdrawDialog"; import WalletRefreshButton from "./WalletRefreshButton"; -import InfoBox from "../../modal/swap/InfoBox"; -import { SatsAmount } from "renderer/components/other/Units"; const useStyles = makeStyles((theme) => ({ title: { diff --git a/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx b/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx index 30c9d7d3..bd2d071d 100644 --- a/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx +++ b/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx @@ -1,11 +1,11 @@ +import { IconButton, styled } from "@material-ui/core"; +import { Close } from "@material-ui/icons"; import { MaterialDesignContent, SnackbarKey, SnackbarProvider, useSnackbar, } from "notistack"; -import { IconButton, styled } from "@material-ui/core"; -import { Close } from "@material-ui/icons"; import { ReactNode } from "react"; const StyledMaterialDesignContent = styled(MaterialDesignContent)(() => ({ diff --git a/src-gui/src/renderer/index.tsx b/src-gui/src/renderer/index.tsx index b0eaf380..59221bcd 100644 --- a/src-gui/src/renderer/index.tsx +++ b/src-gui/src/renderer/index.tsx @@ -1,18 +1,18 @@ import { render } from "react-dom"; import { Provider } from "react-redux"; -import { store } from "./store/storeRenderer"; -import { setRegistryProviders } from "store/features/providersSlice"; import { setAlerts } from "store/features/alertsSlice"; -import { setXmrPrice, setBtcPrice } from "store/features/ratesSlice"; +import { setRegistryProviders } from "store/features/providersSlice"; +import { setBtcPrice, setXmrPrice } from "store/features/ratesSlice"; +import logger from "../utils/logger"; import { fetchAlertsViaHttp, fetchBtcPrice, fetchProvidersViaHttp, fetchXmrPrice, } from "./api"; -import logger from "../utils/logger"; import App from "./components/App"; import { checkBitcoinBalance, getRawSwapInfos } from "./rpc"; +import { store } from "./store/storeRenderer"; setTimeout(() => { checkBitcoinBalance(); diff --git a/src-gui/src/store/combinedReducer.ts b/src-gui/src/store/combinedReducer.ts index 02e440f0..5acd0839 100644 --- a/src-gui/src/store/combinedReducer.ts +++ b/src-gui/src/store/combinedReducer.ts @@ -1,9 +1,9 @@ -import swapReducer from "./features/swapSlice"; -import providersSlice from "./features/providersSlice"; -import torSlice from "./features/torSlice"; -import rpcSlice from "./features/rpcSlice"; import alertsSlice from "./features/alertsSlice"; +import providersSlice from "./features/providersSlice"; import ratesSlice from "./features/ratesSlice"; +import rpcSlice from "./features/rpcSlice"; +import swapReducer from "./features/swapSlice"; +import torSlice from "./features/torSlice"; export const reducers = { swap: swapReducer, diff --git a/src-gui/src/store/hooks.ts b/src-gui/src/store/hooks.ts index 91e7a985..1a39f348 100644 --- a/src-gui/src/store/hooks.ts +++ b/src-gui/src/store/hooks.ts @@ -1,6 +1,6 @@ +import { sortBy } from "lodash"; import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"; import type { AppDispatch, RootState } from "renderer/store/storeRenderer"; -import { sortBy } from "lodash"; import { parseDateString } from "utils/parseUtils"; // Use throughout your app instead of plain `useDispatch` and `useSelector` diff --git a/src-gui/vite.config.ts b/src-gui/vite.config.ts index fac54f2e..4a2412ec 100644 --- a/src-gui/vite.config.ts +++ b/src-gui/vite.config.ts @@ -1,6 +1,6 @@ -import { defineConfig } from "vite"; import react from "@vitejs/plugin-react"; import { internalIpV4 } from "internal-ip"; +import { defineConfig } from "vite"; import tsconfigPaths from "vite-tsconfig-paths"; // @ts-expect-error process is a nodejs global