diff --git a/src/App.tsx b/src/App.tsx index 28b8c06..3c5dea0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -6,7 +6,7 @@ import { ThemeProvider } from '@material-ui/styles' import CssBaseline from '@material-ui/core/CssBaseline' import { SnackbarProvider } from 'notistack' -import BaseRouter from './routes/routes' +import BaseRouter from './routes' import Dashboard from './layout/Dashboard' import { theme } from './theme' import { Provider as StampsProvider } from './providers/Stamps' diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx index 36accd2..b632537 100644 --- a/src/components/SideBar.tsx +++ b/src/components/SideBar.tsx @@ -5,6 +5,7 @@ import { createStyles, Theme, makeStyles } from '@material-ui/core/styles' import { ListItemText, ListItemIcon, ListItem, Divider, List, Drawer, Link as MUILink } from '@material-ui/core' import { OpenInNewSharp } from '@material-ui/icons' import { Home, FileText, DollarSign, Share2, Settings, Layers } from 'react-feather' +import { ROUTES } from '../routes' import SwarmLogoOrange from '../assets/swarm-logo-orange.svg' @@ -14,37 +15,37 @@ const navBarItems = [ { label: 'Info', id: 'info', - path: '/', + path: ROUTES.INFO, icon: Home, }, { label: 'Files', id: 'files', - path: '/files/', + path: ROUTES.FILES, icon: FileText, }, { label: 'Stamps', id: 'stamps', - path: '/stamps/', + path: ROUTES.STAMPS, icon: Layers, }, { label: 'Accounting', id: 'accounting', - path: '/accounting/', + path: ROUTES.ACCOUNTING, icon: DollarSign, }, { label: 'Peers', id: 'peers', - path: '/peers/', + path: ROUTES.PEERS, icon: Share2, }, { label: 'Settings', id: 'settings', - path: '/settings/', + path: ROUTES.SETTINGS, icon: Settings, }, ] @@ -99,7 +100,7 @@ export default function SideBar(props: Props): ReactElement { anchor="left" >
- + swarm
- +
- Click to run status checks on your nodes connection or check out the{' '} + Click to run status checks on your nodes connection or check out the{' '} Swarm Bee Docs diff --git a/src/pages/info/StatusCard.tsx b/src/pages/info/StatusCard.tsx index 22579fe..690b38d 100644 --- a/src/pages/info/StatusCard.tsx +++ b/src/pages/info/StatusCard.tsx @@ -5,6 +5,7 @@ import { createStyles, makeStyles } from '@material-ui/core/styles' import { Card, CardContent, Typography, Chip, Button } from '@material-ui/core/' import { ArrowRight, ArrowDropUp } from '@material-ui/icons/' import { NodeAddresses, Topology } from '@ethersphere/bee-js' +import { ROUTES } from '../../routes' const useStyles = makeStyles(() => createStyles({ @@ -48,7 +49,7 @@ function StatusCard({ Discovered Nodes: {nodeTopology?.population} Connected Peers: - {nodeTopology?.connected} + {nodeTopology?.connected}
diff --git a/src/routes.tsx b/src/routes.tsx new file mode 100644 index 0000000..46ce76a --- /dev/null +++ b/src/routes.tsx @@ -0,0 +1,36 @@ +import type { ReactElement } from 'react' +import { Switch } from 'react-router-dom' + +import { Route } from 'react-router-dom' + +import Info from './pages/info' +import Status from './pages/status' +import Files from './pages/files' +import Peers from './pages/peers' +import Accounting from './pages/accounting' +import Settings from './pages/settings' +import Stamps from './pages/stamps' + +export enum ROUTES { + INFO = '/', + FILES = '/files', + PEERS = '/peers', + ACCOUNTING = '/accounting', + SETTINGS = '/settings', + STAMPS = '/stamps', + STATUS = '/status', +} + +const BaseRouter = (): ReactElement => ( + + + + + + + + + +) + +export default BaseRouter diff --git a/src/routes/routes.tsx b/src/routes/routes.tsx deleted file mode 100644 index 9b0ca1e..0000000 --- a/src/routes/routes.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import type { ReactElement } from 'react' -import { Switch } from 'react-router-dom' - -import { Route } from 'react-router-dom' - -import Info from '../pages/info' -import Status from '../pages/status' -import Files from '../pages/files' -import Peers from '../pages/peers' -import Accounting from '../pages/accounting' -import Settings from '../pages/settings' -import Stamps from '../pages/stamps' - -const BaseRouter = (): ReactElement => ( - - - - - - - - - -) - -export default BaseRouter