Client: display activity date with user timezone - #11
This commit is contained in:
@ -2,8 +2,10 @@ import { format } from 'date-fns'
|
||||
import React from 'react'
|
||||
import { Link } from 'react-router-dom'
|
||||
|
||||
import { getDateWithTZ } from '../../utils'
|
||||
|
||||
export default function ActivitiesList (props) {
|
||||
const { activities, sports } = props
|
||||
const { activities, sports, user } = props
|
||||
return (
|
||||
<div className="card">
|
||||
<div className="card-body">
|
||||
@ -36,7 +38,12 @@ export default function ActivitiesList (props) {
|
||||
{activity.title}
|
||||
</Link>
|
||||
</td>
|
||||
<td>{format(activity.activity_date, 'DD/MM/YYYY HH:mm')}</td>
|
||||
<td>
|
||||
{format(
|
||||
getDateWithTZ(activity.activity_date, user.timezone),
|
||||
'DD/MM/YYYY HH:mm'
|
||||
)}
|
||||
</td>
|
||||
<td className="text-right">
|
||||
{Number(activity.distance).toFixed(2)} km
|
||||
</td>
|
||||
|
@ -36,7 +36,7 @@ class Activities extends React.Component {
|
||||
}
|
||||
render() {
|
||||
const {
|
||||
activities, loadActivities, loadMoreActivities, message, sports
|
||||
activities, loadActivities, loadMoreActivities, message, sports, user
|
||||
} = this.props
|
||||
const { params } = this.state
|
||||
const paginationEnd = activities.length > 0
|
||||
@ -63,6 +63,7 @@ class Activities extends React.Component {
|
||||
<ActivitiesList
|
||||
activities={activities}
|
||||
sports={sports}
|
||||
user={user}
|
||||
/>
|
||||
{!paginationEnd &&
|
||||
<input
|
||||
@ -100,6 +101,7 @@ export default connect(
|
||||
activities: state.activities.data,
|
||||
message: state.message,
|
||||
sports: state.sports.data,
|
||||
user: state.user,
|
||||
}),
|
||||
dispatch => ({
|
||||
loadActivities: params => {
|
||||
|
Reference in New Issue
Block a user