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

Client - add some error messages translation and refactor

Browse Source
This commit is contained in:
Sam
2019-09-16 18:55:58 +02:00
parent f6389f1cdd
commit ed0e467404
14 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
fittrackee_client/src/actions/activities.js
View File

@ -34,7 +34,7 @@ export const addActivity = form => dispatch =>
.then(ret => {
if (ret.status === 'created') {
if (ret.data.activities.length === 0) {
dispatch(setError('activities: no correct file'))
dispatch(setError('activities|no correct file.'))
} else if (ret.data.activities.length === 1) {
dispatch(loadProfile())
history.push(`/activities/${ret.data.activities[0].id}`)
@ -44,11 +44,11 @@ export const addActivity = form => dispatch =>
history.push('/')
}
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
dispatch(setLoading(false))
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
export const addActivityWithoutGpx = form => dispatch =>
FitTrackeeGenericApi.addData('activities/no_gpx', form)
@ -57,10 +57,10 @@ export const addActivityWithoutGpx = form => dispatch =>
dispatch(loadProfile())
history.push(`/activities/${ret.data.activities[0].id}`)
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
export const getActivityGpx = activityId => dispatch => {
if (activityId) {
@ -69,10 +69,10 @@ export const getActivityGpx = activityId => dispatch => {
if (ret.status === 'success') {
dispatch(setGpx(ret.data.gpx))
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
}
dispatch(setGpx(null))
}
@ -86,10 +86,10 @@ export const getSegmentGpx = (activityId, segmentId) => dispatch => {
if (ret.status === 'success') {
dispatch(setGpx(ret.data.gpx))
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
}
dispatch(setGpx(null))
}
@ -101,10 +101,10 @@ export const getActivityChartData = activityId => dispatch => {
if (ret.status === 'success') {
dispatch(setChartData(formatChartData(ret.data.chart_data)))
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
}
dispatch(setChartData(null))
}
@ -118,10 +118,10 @@ export const getSegmentChartData = (activityId, segmentId) => dispatch => {
if (ret.status === 'success') {
dispatch(setChartData(formatChartData(ret.data.chart_data)))
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
}
dispatch(setChartData(null))
}
@ -134,10 +134,10 @@ export const deleteActivity = id => dispatch =>
.then(() => dispatch(loadProfile()))
.then(() => history.push('/'))
} else {
dispatch(setError(`activities: ${ret.status}`))
dispatch(setError(`activities|${ret.status}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
export const editActivity = form => dispatch =>
FitTrackeeGenericApi.updateData('activities', form)
@ -146,11 +146,11 @@ export const editActivity = form => dispatch =>
dispatch(loadProfile())
history.push(`/activities/${ret.data.activities[0].id}`)
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
dispatch(setLoading(false))
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
export const getMoreActivities = params => dispatch =>
FitTrackeeGenericApi.getData('activities', params)
@ -160,10 +160,10 @@ export const getMoreActivities = params => dispatch =>
dispatch(pushActivities(ret.data.activities))
}
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))
export const getMonthActivities = (from, to) => dispatch =>
FitTrackeeGenericApi.getData('activities', {
@ -176,7 +176,7 @@ export const getMonthActivities = (from, to) => dispatch =>
if (ret.status === 'success') {
dispatch(updateCalendar(ret.data.activities))
} else {
dispatch(setError(`activities: ${ret.message}`))
dispatch(setError(`activities|${ret.message}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
.catch(error => dispatch(setError(`activities|${error}`)))

16
fittrackee_client/src/actions/index.js
View File

@ -26,17 +26,17 @@ export const setLoading = loading => ({
export const getOrUpdateData = (action, target, data) => dispatch => {
if (data && data.id && isNaN(data.id)) {
return dispatch(setError(target, `${target}: Incorrect id`))
return dispatch(setError(`${target}|Incorrect id`))
}
return FitTrackeeApi[action](target, data)
.then(ret => {
if (ret.status === 'success') {
dispatch(setData(target, ret.data))
} else {
dispatch(setError(`${target}: ${ret.message || ret.status}`))
dispatch(setError(`${target}|${ret.message || ret.status}`))
}
})
.catch(error => dispatch(setError(`${target}: ${error}`)))
.catch(error => dispatch(setError(`${target}|${error}`)))
}
export const addData = (target, data) => dispatch =>
@ -45,24 +45,24 @@ export const addData = (target, data) => dispatch =>
if (ret.status === 'created') {
history.push(`/admin/${target}`)
} else {
dispatch(setError(`${target}: ${ret.status}`))
dispatch(setError(`${target}|${ret.status}`))
}
})
.catch(error => dispatch(setError(`${target}: ${error}`)))
.catch(error => dispatch(setError(`${target}|${error}`)))
export const deleteData = (target, id) => dispatch => {
if (isNaN(id)) {
return dispatch(setError(target, `${target}: Incorrect id`))
return dispatch(setError(target, `${target}|Incorrect id`))
}
return FitTrackeeApi.deleteData(target, id)
.then(ret => {
if (ret.status === 204) {
history.push(`/admin/${target}`)
} else {
dispatch(setError(`${target}: ${ret.message || ret.status}`))
dispatch(setError(`${target}|${ret.message || ret.status}`))
}
})
.catch(error => dispatch(setError(`${target}: ${error}`)))
.catch(error => dispatch(setError(`${target}|${error}`)))
}
export const updateLanguage = language => dispatch => {

4
fittrackee_client/src/actions/stats.js
View File

@ -7,7 +7,7 @@ export const getStats = (userId, type, data) => dispatch =>
if (ret.status === 'success') {
dispatch(setData('statistics', ret.data))
} else {
dispatch(setError(`statistics: ${ret.message}`))
dispatch(setError(`statistics|${ret.message}`))
}
})
.catch(error => dispatch(setError(`statistics: ${error}`)))
.catch(error => dispatch(setError(`statistics|${error}`)))