diff --git a/embark-ui/src/components/ExplorerDashboardLayout.js b/embark-ui/src/components/ExplorerDashboardLayout.js index 9473dc04f..97e9ad282 100644 --- a/embark-ui/src/components/ExplorerDashboardLayout.js +++ b/embark-ui/src/components/ExplorerDashboardLayout.js @@ -1,8 +1,8 @@ import React from 'react'; import { - Page, - Grid -} from "tabler-react"; + Col, + Row +} from "reactstrap"; import AccountsContainer from '../containers/AccountsContainer'; import BlocksContainer from '../containers/BlocksContainer'; @@ -10,24 +10,24 @@ import TransactionsContainer from '../containers/TransactionsContainer'; const ExplorerDashboardLayout = () => ( - - - Explorer - - - - + + + Explorer + + + + - - - - + + + + - - + + - - + + ); diff --git a/embark-ui/src/components/ExplorerLayout.js b/embark-ui/src/components/ExplorerLayout.js index 9854d80af..360a42c53 100644 --- a/embark-ui/src/components/ExplorerLayout.js +++ b/embark-ui/src/components/ExplorerLayout.js @@ -1,10 +1,12 @@ import React from 'react'; -import {NavLink, Route, Switch} from 'react-router-dom'; +import {NavLink as RouterNavLink, Route, Switch} from 'react-router-dom'; import { - Page, - Grid, - List -} from "tabler-react"; + Row, + Col, + Nav, + NavItem, + NavLink +} from "reactstrap"; import AccountsContainer from '../containers/AccountsContainer'; import AccountContainer from '../containers/AccountContainer'; @@ -14,36 +16,36 @@ import TransactionsContainer from '../containers/TransactionsContainer'; import TransactionContainer from '../containers/TransactionContainer'; const groupItems = [ - {to: "/embark/explorer", icon: "compass", value: "Overview", exact: true}, + {to: "/embark/explorer/overview", icon: "signal", value: "Overview"}, {to: "/embark/explorer/accounts", icon: "users", value: "Accounts"}, - {to: "/embark/explorer/blocks", icon: "book-open", value: "Blocks"}, - {to: "/embark/explorer/transactions", icon: "activity", value: "Transactions"} + {to: "/embark/explorer/blocks", icon: "stop", value: "Blocks"}, + {to: "/embark/explorer/transactions", icon: "tree", value: "Transactions"} ]; const className = "d-flex align-items-center"; -const ExplorerLayout = () => ( - - - Explorer +const ExplorerLayout = (props) => ( + + + Explorer - + {groupItems.map((groupItem) => ( - - {groupItem.value} - + + + {groupItem.value} + + ))} - + - - + + @@ -52,8 +54,8 @@ const ExplorerLayout = () => ( - - + + ); export default ExplorerLayout; diff --git a/embark-ui/src/components/Layout.js b/embark-ui/src/components/Layout.js index 2bc46359c..1abf564a4 100644 --- a/embark-ui/src/components/Layout.js +++ b/embark-ui/src/components/Layout.js @@ -23,8 +23,8 @@ const sidebarNavItems = {items: [ {name: "Dashboard", url: "/embark", icon: 'fa fa-tachometer'}, {name: "Deployment", url: "/embark/deployment", icon: "fa fa-arrow-up"}, {name: "Contracts", url: "/embark/contracts", icon: "fa fa-file-text"}, - {name: "Explorer", url: "/embark/explorer", icon: "fa fa-signal", children: [ - {url: "/embark/explorer", icon: "fa fa-compass", name: "Overview", exact: true}, + {name: "Explorer", url: "/embark/explorer", icon: "fa fa-compass", children: [ + {url: "/embark/explorer/overview", icon: "fa fa-signal", name: "Overview"}, {url: "/embark/explorer/accounts", icon: "fa fa-users", name: "Accounts"}, {url: "/embark/explorer/blocks", icon: "fa fa-stop", name: "Blocks"}, {url: "/embark/explorer/transactions", icon: "fa fa-tree", name: "Transactions"}, diff --git a/embark-ui/src/routes.js b/embark-ui/src/routes.js index d458cd9b1..6c53b9c15 100644 --- a/embark-ui/src/routes.js +++ b/embark-ui/src/routes.js @@ -15,7 +15,7 @@ const routes = ( - +