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-02-07 09:53:12 +01:00
parent 031d8da512 432874294a
commit 72e1529b81
6 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ export const generateIds = arr => {
}
export const createRequest = params => {
export const createApiRequest = params => {
const headers = {}
if (!params.noAuthorization) {
headers.Authorization = `Bearer ${
@ -38,12 +38,15 @@ export const createRequest = params => {
} else if (params.body) {
requestParams.body = params.body
}
const request = new Request(params.url, requestParams)
const request = new Request(`${apiUrl}${params.url}`, requestParams)
return fetch(request)
.then(response => params.method === 'DELETE'
? response
: response.json())
.catch(error => error)
.catch(error => {
console.error(error)
return new Error('An error occurred. Please contact the administrator.')
})
}