diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.js index bd2873da..884b430b 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.js @@ -1,7 +1,6 @@ import { makeStyles } from '@material-ui/core' import classnames from 'classnames' import React from 'react' - import { ReactComponent as CashIn } from 'src/styling/icons/direction/cash-in.svg' import { ReactComponent as CashOut } from 'src/styling/icons/direction/cash-out.svg' import { diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.styles.js b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.styles.js index 5e90173d..a8d73892 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.styles.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.styles.js @@ -51,9 +51,8 @@ const styles = { statusHeader: { marginLeft: 2 }, - /* // temporary class, until alerts are enabled. Delete this table class and uncomment the other one - table: { - height: 463, + /* table: { + maxHeight: 440, '&::-webkit-scrollbar': { width: 7 }, @@ -62,8 +61,10 @@ const styles = { borderRadius: 5 } }, */ + // temporary, when notifications are enabled delete this one and decomment above table: { - maxHeight: 440, + maxHeight: 465, + minHeight: 465, '&::-webkit-scrollbar': { width: 7 }, diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.styles.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.styles.js index 838dbad8..de57aca7 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.styles.js +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.styles.js @@ -1,6 +1,6 @@ import { zircon } from 'src/styling/variables' -export default { +const styles = { expandButton: { outline: 'none', border: 'none', @@ -41,3 +41,5 @@ export default { flexDirection: 'column' }) } + +export default styles diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DetailsCard.styles.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DetailsCard.styles.js index 277bcfd2..71969897 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DetailsCard.styles.js +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DetailsCard.styles.js @@ -3,7 +3,7 @@ import { offColor } from 'src/styling/variables' const { p } = typographyStyles -export default { +const styles = { wrapper: { display: 'flex', flexDirection: 'column', @@ -82,3 +82,5 @@ export default { width: 215 } } + +export default styles diff --git a/new-lamassu-admin/src/routing/routes.js b/new-lamassu-admin/src/routing/routes.js index bd176c85..0e98e255 100644 --- a/new-lamassu-admin/src/routing/routes.js +++ b/new-lamassu-admin/src/routing/routes.js @@ -51,18 +51,18 @@ const useStyles = makeStyles({ }) const tree = [ - { + /* { key: 'dashboard', label: 'Dashboard', route: '/dashboard', component: Dashboard - }, - { + }, */ + /* { key: 'machines', label: 'Machines', route: '/machines', component: Machines - }, + }, */ { key: 'transactions', label: 'Transactions',