diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json index 44c2094f..441bf0ad 100644 --- a/new-lamassu-admin/package-lock.json +++ b/new-lamassu-admin/package-lock.json @@ -8327,6 +8327,11 @@ "picomatch": "^2.0.5" } }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/Scatterplot.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/Scatterplot.js deleted file mode 100644 index ef08a169..00000000 --- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/Scatterplot.js +++ /dev/null @@ -1,134 +0,0 @@ -/*eslint-disable*/ -import { scaleLinear, scaleTime, max, axisLeft, axisBottom, select } from 'd3' -import React, { useMemo } from 'react' -import moment from 'moment' - -const data = [ - [0, '2020-11-08T18:00:05.664Z'], - [40.01301, '2020-11-09T11:17:05.664Z'] -] - -const marginTop = 10 -const marginRight = 30 -const marginBottom = 30 -const marginLeft = 60 -const width = 510 - marginLeft - marginRight -const height = 141 - marginTop - marginBottom - -const Scatterplot = ({ data: realData }) => { - const x = scaleTime() - .domain([ - moment() - .add(-1, 'day') - .valueOf(), - moment().valueOf() - ]) - .range([0, width]) - .nice() - - const y = scaleLinear() - .domain([0, 1000]) - .range([height, 0]) - .nice() - - // viewBox="0 0 540 141" - return ( - <> - - - - {axisLeft(y)} - {/* */} - - - - - ) -} - -const XAxis = ({ - range = [10, 500], - transform, - scale: xScale, - numTicks = 7 -}) => { - const ticks = useMemo(() => { - return xScale.ticks(numTicks).map(value => ({ - value, - xOffset: xScale(value) - })) - }, [range.join('-')]) - - return ( - - {ticks.map(({ value, xOffset }) => ( - - - {value.getHours()} - - - ))} - - ) -} - -const YAxis = ({ - range = [10, 500], - transform, - scale: xScale, - numTicks = 7 -}) => { - const ticks = useMemo(() => { - return xScale.ticks(numTicks).map(value => ({ - value, - xOffset: xScale(value) - })) - }, [range.join('-')]) - - return ( - - {ticks.map(({ value, xOffset }) => ( - - - {value} - - - ))} - - ) -} - -const RenderCircles = ({ data, scale }) => { - let renderCircles = data.map((item, idx) => { - return ( - - ) - }) - return {renderCircles} -} - -export default Scatterplot diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js index cc9233ac..7bc345cf 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.styles.js +++ b/new-lamassu-admin/src/pages/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', @@ -43,7 +43,6 @@ export default { extend: p, display: 'flex', padding: [[11, 8]], - // rework this into a proper component '& > div': { display: 'flex', flexDirection: 'column', @@ -82,3 +81,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 0e98e255..be3e1c2c 100644 --- a/new-lamassu-admin/src/routing/routes.js +++ b/new-lamassu-admin/src/routing/routes.js @@ -51,18 +51,6 @@ 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',