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} />
) : (

25
fittrackee_client/src/components/App.css
View File

@ -1,7 +1,17 @@
.App {
html {
height: 100vh;
}
body {
background-color: #eaeaea;
padding-bottom: 20px;
margin: 0;
min-height: 100vh;
padding-bottom: 50px;
position: relative;
}
.App {
padding-bottom: 20px;
text-align: center;
}
@ -230,6 +240,17 @@ label {
color: #405976;
}
.footer {
background-color: #f8f9fa;
bottom: 0;
color: #8b8c8c;
font-size: 0.9em;
height: 50px;
line-height: 50px;
position: absolute;
width: 100%;
}
.huge {
font-size: 25px;
}

2
fittrackee_client/src/components/App.jsx
View File

@ -6,6 +6,7 @@ import './App.css'
import Activity from './Activity'
import Activities from './Activities'
import Dashboard from './Dashboard'
import Footer from './Footer'
import Logout from './User/Logout'
import NavBar from './NavBar'
import NotFound from './Others/NotFound'
@ -98,6 +99,7 @@ export default class App extends React.Component {
{/* <Route path="/admin" component={Admin} /> */}
<Route component={NotFound} />
</Switch>
<Footer />
</div>
)
}

8
fittrackee_client/src/components/Dashboard/UserStatistics.jsx
View File

@ -12,7 +12,7 @@ export default function UserStatistics (props) {
duration = `${duration.split(':')[0]}h ${duration.split(':')[1]}min`
return (
<div className="row">
<div className="col">
<div className="col-md-3">
<div className="card activity-card">
<div className="card-body row">
<div className="col-3">
@ -25,7 +25,7 @@ export default function UserStatistics (props) {
</div>
</div>
</div>
<div className="col">
<div className="col-md-3">
<div className="card activity-card">
<div className="card-body row">
<div className="col-3">
@ -40,7 +40,7 @@ export default function UserStatistics (props) {
</div>
</div>
</div>
<div className="col">
<div className="col-md-3">
<div className="card activity-card">
<div className="card-body row">
<div className="col-3">
@ -53,7 +53,7 @@ export default function UserStatistics (props) {
</div>
</div>
</div>
<div className="col">
<div className="col-md-3">
<div className="card activity-card">
<div className="card-body row">
<div className="col-3">

29
fittrackee_client/src/components/Footer/index.jsx Normal file
View File

@ -0,0 +1,29 @@
import React from 'react'
import { version } from './../../utils'
export default function Footer() {
return (
<footer className="footer">
<div className="container">
<strong>FitTrackee</strong> v{version} -{' '}
<a
href="https://github.com/SamR1/FitTrackee"
target="_blank"
rel="noopener noreferrer"
>
source code
</a> under{' '}
<a
href="https://choosealicense.com/licenses/gpl-3.0/"
target="_blank"
rel="noopener noreferrer"
>
GPLv3
</a>{' '}
license
</div>
</footer>
)
}

1
fittrackee_client/src/utils/index.js
View File

@ -1,6 +1,7 @@
import { format, parse } from 'date-fns'
import { DateTime } from 'luxon'
export const version = '0.2.0' // version stored in 'utils' for now
export const apiUrl = `${process.env.REACT_APP_API_URL}/api/`
export const thunderforestApiKey = `${
process.env.REACT_APP_THUNDERFOREST_API_KEY