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

Merge branch 'master' into v0.2

Browse Source
This commit is contained in:
Sam
2019-01-06 21:57:26 +01:00
parent 90b1e5f730 066a0d79c7
commit 68f0d47b2f
9 changed files with 95 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,20 +16,22 @@ export default function ActivityCardHeader(props) {
<div className="container">
<div className="row">
<div className="col-auto">
{activity.next_activity ? (
{activity.previous_activity ? (
<Link
className="unlink"
to={`/activities/${activity.next_activity}`}
to={`/activities/${activity.previous_activity}`}
>
<i
className="fa fa-chevron-left"
aria-hidden="true"
title="See previous activity"
/>
</Link>
) : (
<i
className="fa fa-chevron-left inactive-link"
aria-hidden="true"
title="No previous activity"
/>
)}
</div>
@ -49,12 +51,14 @@ export default function ActivityCardHeader(props) {
<i
className="fa fa-edit custom-fa"
aria-hidden="true"
title="Edit activity"
/>
</Link>
<i
className="fa fa-trash custom-fa"
aria-hidden="true"
onClick={() => displayModal(true)}
title="Delete activity"
/><br />
{activityDate && (
<span className="activity-date">
@ -63,20 +67,22 @@ export default function ActivityCardHeader(props) {
)}
</div>
<div className="col-auto">
{activity.previous_activity ? (
{activity.next_activity ? (
<Link
className="unlink"
to={`/activities/${activity.previous_activity}`}
to={`/activities/${activity.next_activity}`}
>
<i
className="fa fa-chevron-right"
aria-hidden="true"
title="See next activity"
/>
</Link>
) : (
<i
className="fa fa-chevron-right inactive-link"
aria-hidden="true"
title="No next activity"
/>
)}
</div>

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

@ -79,7 +79,7 @@ class ActivityDisplay extends React.Component {
</div>
<div className="card-body">
<div className="row">
<div className="col-8">
<div className="col-md-8">
{activity.with_gpx ? (
<ActivityMap activity={activity} />
) : (