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

Client - reformat js files w/ prettier

Browse Source
This commit is contained in:
Sam
2019-08-28 15:35:22 +02:00
parent c8ea44eecc
commit 2a52b9081d
57 changed files with 1148 additions and 1252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fittrackee_client/src/utils/activities.js
View File

@ -32,7 +32,7 @@ export const getGeoJson = gpxContent => {
export const formatActivityDate = (
dateTime,
dateFormat = null,
timeFormat = null,
timeFormat = null
) => {
if (!dateFormat) {
dateFormat = 'yyyy/MM/dd'
@ -70,16 +70,16 @@ export const formatRecord = (record, tz) => {
case 'FD':
value = `${record.value} km`
break
default: // 'LD'
default:
// 'LD'
value = record.value // eslint-disable-line prefer-destructuring
}
const [recordType] = recordsLabels.filter(
r => r.record_type === record.record_type
)
return {
activity_date: formatActivityDate(
getDateWithTZ(record.activity_date, tz)
).activity_date,
activity_date: formatActivityDate(getDateWithTZ(record.activity_date, tz))
.activity_date,
activity_id: record.activity_id,
id: record.id,
record_type: recordType.label,

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

@ -3,9 +3,10 @@ import { DateTime } from 'luxon'
export const version = '0.2.1-beta' // version stored in 'utils' for now
export const apiUrl = `${process.env.REACT_APP_API_URL}/api/`
/* prettier-ignore */
export const thunderforestApiKey = `${
process.env.REACT_APP_THUNDERFOREST_API_KEY
}`
}`
export const gpxLimit = `${process.env.REACT_APP_GPX_LIMIT_IMPORT}`
export const isRegistrationAllowed =
process.env.REACT_APP_ALLOW_REGISTRATION !== 'false'
@ -21,12 +22,10 @@ export const generateIds = arr => {
})
}
export const createApiRequest = params => {
const headers = {}
if (!params.noAuthorization) {
headers.Authorization = `Bearer ${
window.localStorage.getItem('authToken')}`
headers.Authorization = `Bearer ${window.localStorage.getItem('authToken')}`
}
if (params.type) {
headers['Content-Type'] = params.type
@ -42,22 +41,23 @@ export const createApiRequest = params => {
}
const request = new Request(`${apiUrl}${params.url}`, requestParams)
return fetch(request)
.then(response => params.method === 'DELETE'
? response
: response.json())
.then(response => (params.method === 'DELETE' ? response : response.json()))
.catch(error => {
console.error(error)
return new Error('An error occurred. Please contact the administrator.')
})
}
export const getDateWithTZ = (date, tz) => {
if (!date) {
return ''
}
const dt = DateTime.fromISO(
format(new Date(date), "yyyy-MM-dd'T'HH:mm:ss.SSSxxx")).setZone(tz)
format(new Date(date), "yyyy-MM-dd'T'HH:mm:ss.SSSxxx")
).setZone(tz)
return parse(
dt.toFormat('yyyy-MM-dd HH:mm:ss'), 'yyyy-MM-dd HH:mm:ss', new Date())
dt.toFormat('yyyy-MM-dd HH:mm:ss'),
'yyyy-MM-dd HH:mm:ss',
new Date()
)
}

55
fittrackee_client/src/utils/stats.js
View File

@ -1,12 +1,13 @@
import {
addDays,
addMonths,
addYears, format, startOfMonth,
addYears,
format,
startOfMonth,
startOfWeek,
startOfYear
startOfYear,
} from 'date-fns'
const xAxisFormats = [
{ duration: 'week', dateFormat: 'yyyy-MM-dd', xAxis: 'dd/MM' },
{ duration: 'month', dateFormat: 'yyyy-MM', xAxis: 'MM/yyyy' },
@ -24,22 +25,21 @@ export const formatDuration = (totalSeconds, formatWithDay = false) => {
const minutes = String(Math.floor(totalSeconds / 60)).padStart(2, '0')
const seconds = String(totalSeconds % 60).padStart(2, '0')
if (formatWithDay) {
return `${
days === '0' ? '' : `${days}d:`
}${
return `${days === '0' ? '' : `${days}d:`}${
hours === '00' ? '' : `${hours}h:`
}${minutes}m:${seconds}s`
}
return `${hours === '00' ? '' : `${hours}:`}${minutes}:${seconds}`
}
export const formatValue = (displayedData, value) => value === 0
export const formatValue = (displayedData, value) =>
value === 0
? ''
: displayedData === 'distance'
? `${value.toFixed(2)} km`
: displayedData === 'duration'
? formatDuration(value)
: value
? `${value.toFixed(2)} km`
: displayedData === 'duration'
? formatDuration(value)
: value
const dateIncrement = (duration, day) => {
switch (duration) {
@ -65,16 +65,15 @@ const startDate = (duration, day) => {
}
}
export const formatStats = (
stats, sports, params, displayedSports
) => {
export const formatStats = (stats, sports, params, displayedSports) => {
const nbActivitiesStats = []
const distanceStats = []
const durationStats = []
for (let day = startDate(params.duration, params.start);
day <= params.end;
day = dateIncrement(params.duration, day)
for (
let day = startDate(params.duration, params.start);
day <= params.end;
day = dateIncrement(params.duration, day)
) {
const [xAxisFormat] = xAxisFormats.filter(
x => x.duration === params.duration
@ -86,15 +85,17 @@ export const formatStats = (
const dataDuration = { date: xAxis }
if (stats[date]) {
Object.keys(stats[date]).filter(
sportId => displayedSports ? displayedSports.includes(+sportId) : true
).map(sportId => {
const sportLabel = sports.filter(s => s.id === +sportId)[0].label
dataNbActivities[sportLabel] = stats[date][sportId].nb_activities
dataDistance[sportLabel] = stats[date][sportId].total_distance
dataDuration[sportLabel] = stats[date][sportId].total_duration
return null
})
Object.keys(stats[date])
.filter(sportId =>
displayedSports ? displayedSports.includes(+sportId) : true
)
.map(sportId => {
const sportLabel = sports.filter(s => s.id === +sportId)[0].label
dataNbActivities[sportLabel] = stats[date][sportId].nb_activities
dataDistance[sportLabel] = stats[date][sportId].total_distance
dataDuration[sportLabel] = stats[date][sportId].total_duration
return null
})
}
nbActivitiesStats.push(dataNbActivities)
distanceStats.push(dataDistance)
@ -104,6 +105,6 @@ export const formatStats = (
return {
activities: nbActivitiesStats,
distance: distanceStats,
duration: durationStats
duration: durationStats,
}
}