API: unique filename for gpx, Client: pagination status

This commit is contained in:
Sam
2018-05-11 13:45:54 +02:00
parent 7ef643a2fe
commit 288528716c
5 changed files with 54 additions and 14 deletions

View File

@ -3,8 +3,9 @@ import mpwoApi from '../mwpoApi/activities'
import { history } from '../index'
import { setError } from './index'
export const endPagination = () => ({
type: 'END_PAGINATION'
export const endPagination = status => ({
type: 'END_PAGINATION',
status,
})
export const pushActivities = activities => ({
@ -63,8 +64,9 @@ export const deleteActivity = id => dispatch => mpwoGenericApi
.then(ret => {
if (ret.status === 204) {
history.push('/')
}
} else {
dispatch(setError(`activities: ${ret.status}`))
}
})
.catch(error => dispatch(setError(`activities: ${error}`)))
@ -87,8 +89,9 @@ export const getMoreActivities = page => dispatch => mpwoGenericApi
if (ret.status === 'success') {
if (ret.data.activities.length > 0) {
dispatch(pushActivities(ret.data.activities))
} else {
dispatch(endPagination())
}
if (ret.data.activities.length < 5) {
dispatch(endPagination(true))
}
} else {
dispatch(setError(`activities: ${ret.message}`))