IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Ilya Oleshko 2021-03-01 16:46:32 +03:00
commit c618740db1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ASC.Web.Common/package.json
View File

@ -134,5 +134,9 @@
"engines": {
"node": ">=8",
"npm": ">=5"
},
"api": {
"url": "api/2.0",
"timeout": "30000"
}
}

8
web/ASC.Web.Common/src/api/client.js
View File

@ -1,9 +1,9 @@
import axios from "axios";
import config from "../../package.json";
//import history from "../history";
const PREFIX = "api";
const VERSION = "2.0";
const baseURL = `${window.location.origin}/${PREFIX}/${VERSION}`;
const baseURL = `${window.location.origin}/${config.api.url}`;
const apiTimeout = config.api.timeout;
/**
* @description axios instance for ajax requests
@ -12,7 +12,7 @@ const baseURL = `${window.location.origin}/${PREFIX}/${VERSION}`;
const client = axios.create({
baseURL: baseURL,
responseType: "json",
timeout: 30000, // default is `0` (no timeout)
timeout: apiTimeout, // default is `0` (no timeout)
});
client.interceptors.response.use(