diff --git a/mpwo_client/src/components/Activities/ActivityDisplay/ActivityCharts.jsx b/mpwo_client/src/components/Activities/ActivityDisplay/ActivityCharts.jsx index 3707509b..3067918c 100644 --- a/mpwo_client/src/components/Activities/ActivityDisplay/ActivityCharts.jsx +++ b/mpwo_client/src/components/Activities/ActivityDisplay/ActivityCharts.jsx @@ -2,7 +2,7 @@ import { format } from 'date-fns' import React from 'react' import { connect } from 'react-redux' import { - Line, LineChart, ResponsiveContainer, Tooltip, XAxis, YAxis + Area, ComposedChart, Line, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts' import { getActivityChartData } from '../../../actions/activities' @@ -75,7 +75,7 @@ class ActivityCharts extends React.Component {
- @@ -97,28 +97,31 @@ class ActivityCharts extends React.Component { label={{ value: 'altitude (m)', angle: -90, position: 'right' }} yAxisId="right" orientation="right" /> + - displayDistance - ? `${value} km` - : format(value, 'HH:mm:ss')} + ? `distance: ${value} km` + : `duration: ${format(value, 'HH:mm:ss')}`} /> - +
+
data from gpx, without any cleaning
) } diff --git a/mpwo_client/src/components/Activities/ActivityDisplay/index.jsx b/mpwo_client/src/components/Activities/ActivityDisplay/index.jsx index 9b7eca5e..46188878 100644 --- a/mpwo_client/src/components/Activities/ActivityDisplay/index.jsx +++ b/mpwo_client/src/components/Activities/ActivityDisplay/index.jsx @@ -95,6 +95,7 @@ class ActivityDisplay extends React.Component {
+
Chart
diff --git a/mpwo_client/src/components/App.css b/mpwo_client/src/components/App.css index 959b08cc..88780836 100644 --- a/mpwo_client/src/components/App.css +++ b/mpwo_client/src/components/App.css @@ -100,6 +100,11 @@ input, textarea { font-size: 0.9em; } +.chart-info { + font-size: 0.8em; + font-style: italic; +} + .chart-radio { display: flex; font-size: 0.8em; @@ -113,6 +118,11 @@ input, textarea { margin-right: 10px; } +.chart-title { + font-size: 1.1em; + margin-bottom: 10px; +} + .custom-modal { background-color: #fff; border-radius: 5px;