From 92ccd8cb923021a7c7d6628b1535ec96fb27dcb2 Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Mon, 28 Apr 2025 10:06:33 +0100 Subject: [PATCH] partial: Analytics css migration --- .../src/pages/Analytics/Analytics.jsx | 45 +++-- .../src/pages/Analytics/Analytics.module.css | 0 .../src/pages/Analytics/Analytics.styles.js | 163 ------------------ .../Analytics/components/LegendEntry.jsx | 9 +- .../components/tooltips/GraphTooltip.jsx | 22 +-- .../tooltips/GraphTooltip.styles.js | 29 ---- .../components/wrappers/HourOfDayWrapper.jsx | 7 +- .../components/wrappers/OverTimeWrapper.jsx | 18 +- .../wrappers/TopMachinesWrapper.jsx | 7 +- .../wrappers/VolumeOverTimeWrapper.jsx | 18 +- .../components/wrappers/wrappers.module.css | 56 ++++++ .../src/styling/global/global.css | 10 ++ 12 files changed, 116 insertions(+), 268 deletions(-) create mode 100644 new-lamassu-admin/src/pages/Analytics/Analytics.module.css delete mode 100644 new-lamassu-admin/src/pages/Analytics/Analytics.styles.js delete mode 100644 new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.styles.js create mode 100644 new-lamassu-admin/src/pages/Analytics/components/wrappers/wrappers.module.css diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx index e27f2aa6..679afad5 100644 --- a/new-lamassu-admin/src/pages/Analytics/Analytics.jsx +++ b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx @@ -1,6 +1,4 @@ -import { useQuery, gql } from "@apollo/client"; -import Box from '@mui/material/Box' -import { makeStyles } from '@mui/styles' +import { useQuery, gql } from '@apollo/client' import classnames from 'classnames' import { endOfToday } from 'date-fns' import { subDays, format, add, startOfWeek } from 'date-fns/fp' @@ -17,15 +15,12 @@ import { fromNamespace } from 'src/utils/config' import { numberToFiatAmount } from 'src/utils/number' import { DAY, WEEK, MONTH } from 'src/utils/time' -import styles from './Analytics.styles' import LegendEntry from './components/LegendEntry' import HourOfDayWrapper from './components/wrappers/HourOfDayWrapper' import OverTimeWrapper from './components/wrappers/OverTimeWrapper' import TopMachinesWrapper from './components/wrappers/TopMachinesWrapper' import VolumeOverTimeWrapper from './components/wrappers/VolumeOverTimeWrapper' -const useStyles = makeStyles(styles) - const MACHINE_OPTIONS = [{ code: 'all', display: 'All machines' }] const REPRESENTING_OPTIONS = [ { code: 'overTime', display: 'Over time' }, @@ -106,26 +101,28 @@ const GET_DATA = gql` } ` -const OverviewEntry = ({ label, value, oldValue, currency }) => { - const classes = useStyles() +const VerticalLine = () => ( +
+) +const OverviewEntry = ({ label, value, oldValue, currency }) => { const _oldValue = !oldValue || R.equals(oldValue, 0) ? 1 : oldValue const growthRate = ((value - oldValue) * 100) / _oldValue const growthClasses = { - [classes.growthPercentage]: true, - [classes.growth]: R.gt(value, oldValue), - [classes.decline]: R.gt(oldValue, value) + 'font-bold': true, + 'text-malachite': R.gt(value, oldValue), + 'text-tomato': R.gt(oldValue, value) } return ( -
+

{label}

- - {numberToFiatAmount(value)} + + {numberToFiatAmount(value)} {!!currency && ` ${currency}`} - + {R.gt(growthRate, 0) && } {R.lt(growthRate, 0) && } {R.equals(growthRate, 0) && } @@ -138,8 +135,6 @@ const OverviewEntry = ({ label, value, oldValue, currency }) => { } const Analytics = () => { - const classes = useStyles() - const { data: txResponse, loading: txLoading } = useQuery(GET_TRANSACTIONS, { variables: { from: subDays(65, endOfToday()), @@ -320,7 +315,7 @@ const Analytics = () => { !loading && ( <> - +
{ IconComponent={EqualIcon} label={'Same since last period'} /> - +
-
-
+
+
{ - const classes = useStyles() - const [graphType /*, setGraphType */] = useState(options[0].code) const legend = { diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx b/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx index cc3fe801..718036c9 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx @@ -1,17 +1,14 @@ import Box from '@mui/material/Box' import Switch from '@mui/material/Switch' -import { makeStyles } from '@mui/styles' import React, { useState } from 'react' -import { H2 } from 'src/components/typography' +import { H2, Label1 } from 'src/components/typography' import { Select } from 'src/components/inputs' import { neon, java } from 'src/styling/variables' -import styles from '../../Analytics.styles' import Graph from '../../graphs/Graph' import LegendEntry from '../LegendEntry' - -const useStyles = makeStyles(styles) +import classes from './wrappers.module.css' const VolumeOverTimeGraphHeader = ({ title, @@ -24,8 +21,6 @@ const VolumeOverTimeGraphHeader = ({ timezone, currency }) => { - const classes = useStyles() - const [logarithmic, setLogarithmic] = useState() const legend = { @@ -63,8 +58,13 @@ const VolumeOverTimeGraphHeader = ({
- Log. scale - setLogarithmic(event.target.checked)} /> + + Log. scale + + setLogarithmic(event.target.checked)} + />