Client - replace 'Activity' with 'Workout' - fix #58

This commit is contained in:
Sam
2021-01-10 11:39:48 +01:00
parent 3a80e01cc2
commit 5c04db6c08
75 changed files with 986 additions and 1006 deletions

View File

@ -1,14 +1,14 @@
import React from 'react'
import { Link } from 'react-router-dom'
export default class NoActivities extends React.PureComponent {
export default class NoWorkouts extends React.PureComponent {
render() {
const { t } = this.props
return (
<div className="card text-center">
<div className="card-body">
{t('common:No workouts.')}{' '}
<Link to={{ pathname: '/activities/add' }}>
<Link to={{ pathname: '/workouts/add' }}>
{t('dashboard:Upload one !')}
</Link>
</div>

View File

@ -4,13 +4,13 @@ import { apiUrl } from '../../utils'
export default class StaticMap extends React.PureComponent {
render() {
const { activity, display } = this.props
const { display, workout } = this.props
return (
<div className={`activity-map${display === 'list' ? '-list' : ''}`}>
<div className={`workout-map${display === 'list' ? '-list' : ''}`}>
<img
src={`${apiUrl}activities/map/${activity.map}?${Date.now()}`}
alt="activity map"
src={`${apiUrl}workouts/map/${workout.map}?${Date.now()}`}
alt="workout map"
/>
<div className={`map-attribution${display === 'list' ? '-list' : ''}`}>
<span className="map-attribution-text">©</span>

View File

@ -8,8 +8,8 @@ import {
YAxis,
} from 'recharts'
import { activityColors } from '../../../utils/activities'
import { formatValue } from '../../../utils/stats'
import { workoutColors } from '../../../utils/workouts'
import CustomTooltip from './CustomTooltip'
import CustomLabel from './CustomLabel'
@ -56,11 +56,11 @@ export default class StatsCharts extends React.PureComponent {
<label className="radioLabel col">
<input
type="radio"
name="activities"
checked={displayedData === 'activities'}
name="workouts"
checked={displayedData === 'workouts'}
onChange={e => this.handleRadioChange(e)}
/>
{t('statistics:activities')}
{t('statistics:workouts')}
</label>
</div>
<ResponsiveContainer height={300}>
@ -81,7 +81,7 @@ export default class StatsCharts extends React.PureComponent {
key={s.id}
dataKey={s.label}
stackId="a"
fill={activityColors[i]}
fill={workoutColors[i]}
label={
i === sports.length - 1 ? (
<CustomLabel displayedData={displayedData} />

View File

@ -23,7 +23,7 @@ class Statistics extends React.PureComponent {
updateData() {
if (this.props.user.username) {
this.props.loadActivities(
this.props.loadWorkouts(
this.props.user.username,
this.props.user.weekm,
this.props.statsParams
@ -62,7 +62,7 @@ export default connect(
user: state.user,
}),
dispatch => ({
loadActivities: (userName, weekm, data) => {
loadWorkouts: (userName, weekm, data) => {
const dateFormat = 'yyyy-MM-dd'
// depends on user config (first day of week)
const time =