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

Client: display activity date with user timezone - #11

Browse Source
This commit is contained in:
Sam
2018-06-11 15:24:34 +02:00
parent fe91040370
commit 31d23da473
11 changed files with 69 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fittrackee_client/src/components/Activity/ActivityDisplay/ActivityCardHeader.jsx
View File

@ -1,13 +1,15 @@
import React from 'react'
import { Link } from 'react-router-dom'
import { formatActivityDate } from '../../../utils'
import { formatActivityDate, getDateWithTZ } from '../../../utils'
export default function ActivityCardHeader(props) {
const { activity, displayModal, sport, title } = props
const { activity, displayModal, sport, title, user } = props
const activityDate = activity
? formatActivityDate(activity.activity_date)
? formatActivityDate(
getDateWithTZ(activity.activity_date, user.timezone)
)
: null
return (
<div className="container">

3
fittrackee_client/src/components/Activity/ActivityDisplay/index.jsx
View File

@ -34,7 +34,7 @@ class ActivityDisplay extends React.Component {
}
render() {
const { activities, message, onDeleteActivity, sports } = this.props
const { activities, message, onDeleteActivity, sports, user } = this.props
const { displayModal } = this.state
const [activity] = activities
const title = activity ? activity.title : 'Activity'
@ -71,6 +71,7 @@ class ActivityDisplay extends React.Component {
activity={activity}
sport={sport}
title={title}
user={user}
displayModal={() => this.displayModal(true)}
/>
</div>