Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor refactor

Browse Source
This commit is contained in:
Sam 2020-01-28 15:47:38 +01:00
parent e4cb0404ce
commit 5ad074bb1f
2 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fittrackee_client/src/components/Dashboard/Calendar.jsx
View File

@ -13,13 +13,12 @@ import {
subMonths,
} from 'date-fns'
import { enGB, fr } from 'date-fns/locale'
import React, { Fragment } from 'react'
import React from 'react'
import { connect } from 'react-redux'
import { Link } from 'react-router-dom'
import CalendarActivities from './CalendarActivities'
import { getMonthActivities } from '../../actions/activities'
import { getDateWithTZ } from '../../utils'
import { recordsLabels } from '../../utils/activities'
const getStartAndEndMonth = (date, weekStartOnMonday) => {
const monthStart = startOfMonth(date)
@ -114,36 +113,11 @@ class Calendar extends React.Component {
<div className={`col cell ${isWeekEnd ? ' weekend' : ''}`} key={day}>
<div className={`img${isDisabled}`}>
<span className="number">{formattedDate}</span>
{dayActivities.map(act => (
<Link key={act.id} to={`/activities/${act.id}`}>
<Fragment>
<img
alt="activity sport logo"
className={`activity-sport ${isDisabled}`}
src={sports
.filter(s => s.id === act.sport_id)
.map(s => s.img)}
title={act.title}
/>
{act.records.length > 0 && (
<sup>
<i
className="fa fa-trophy custom-fa-small"
aria-hidden="true"
title={act.records.map(
rec =>
` ${
recordsLabels.filter(
r => r.record_type === rec.record_type
)[0].label
}`
)}
/>
</sup>
)}
</Fragment>
</Link>
))}
<CalendarActivities
dayActivities={dayActivities}
isDisabled={isDisabled}
sports={sports}
/>
</div>
</div>
)

42
fittrackee_client/src/components/Dashboard/CalendarActivities.jsx Normal file
View File

@ -0,0 +1,42 @@
import React from 'react'
import { Link } from 'react-router-dom'
import { recordsLabels } from '../../utils/activities'
export default class CalendarActivities extends React.PureComponent {
render() {
const { dayActivities, isDisabled, sports } = this.props
return (
<>
{dayActivities.map(act => (
<Link key={act.id} to={`/activities/${act.id}`}>
<>
<img
alt="activity sport logo"
className={`activity-sport ${isDisabled}`}
src={sports.filter(s => s.id === act.sport_id).map(s => s.img)}
title={act.title}
/>
{act.records.length > 0 && (
<sup>
<i
className="fa fa-trophy custom-fa-small"
aria-hidden="true"
title={act.records.map(
rec =>
` ${
recordsLabels.filter(
r => r.record_type === rec.record_type
)[0].label
}`
)}
/>
</sup>
)}
</>
</Link>
))}
</>
)
}
}