Переписываю спорные решения

Фикс отправки отчета, проверка на массив в map в Description.js
2023-01-20 16:20:06 +03:00
parent 642a8a9641
commit 56f63dbed2
50 changed files with 34327 additions and 9279 deletions
--- a/src/api/request.js
+++ b/src/api/request.js
@ -1,48 +1,54 @@
-// import axios from 'axios';
-// import {getToken, urlHasParams} from "../helper";
-//
-//
-//
-// const instance = axios.create({
-//   baseURL: process.env.REACT_APP_API_URL,
-//   validateStatus(status) {
-//     return status;
-//   },
-// });
-//
-// export default function request(url, {method = 'get', params, data, headers} = {}) {
-//   const fullHeaders = {...headers, ...getToken()};
-//   let urWithParams = urlHasParams(url);
-//
-//
-//   return instance
-//       .request({
-//         url: urWithParams,
-//         method,
-//         params,
-//         data,
-//         headers: {...fullHeaders},
-//       })
-//       .then(response => new Promise(resolve => {
-//         console.log(response, 1)
-//         if(response.data.redirect || response.status === 401) {
-//
-//           // window.location.href = "/auth"
-//         }
-//         return resolve(response)
-//       }))
-//       .then(response => new Promise(resolve => resolve(response.data)))
-// }
-//
-// function RequestError(code, msg, data) {
-//   const description = msg ? `- ${msg}` : '';
-//
-//   this.name = 'RequestError';
-//   this.message = `API returned: ${code}${description}.`;
-//   this.code = code;
-//   this.description = msg;
-//   this.data = data;
-// }
-//
-// RequestError.prototype = Object.create(Error.prototype);
-// RequestError.prototype.constructor = RequestError;
+import axios from 'axios';
+import {getToken, urlHasParams} from "../helper";
+
+
+
+const instance = axios.create({
+  baseURL: process.env.REACT_APP_API_URL,
+  validateStatus(status) {
+    return status;
+  },
+});
+
+export const apiRequest = (url, {
+  method = 'get', params, data,
+  headers = {
+    'Access-Control-Allow-Origin': '*',
+    'Content-Type': 'application/json'
+  },
+} = {}) => {
+  const fullHeaders = {...headers, ...getToken()};
+  let urWithParams = urlHasParams(url);
+
+
+  return instance
+      .request({
+        url: urWithParams,
+        method,
+        params,
+        data,
+        headers: {...fullHeaders},
+      })
+      .then(response => new Promise(resolve => {
+        if (response.data.redirect || response.status === 401) {
+          window.location.reduce('/');
+          localStorage.clear();
+          // dispatch(auth(false));
+        }
+        return resolve(response)
+      }))
+      .then(response => new Promise(resolve => resolve(response.data)))
+};
+
+const RequestError = (code, msg, data) => {
+  const description = msg ? `- ${msg}` : '';
+
+  this.name = 'RequestError';
+  this.message = `API returned: ${code}${description}.`;
+  this.code = code;
+  this.description = msg;
+  this.data = data;
+};
+
+RequestError.prototype = Object.create(Error.prototype);
+RequestError.prototype.constructor = RequestError;