Fixing after react update

2023-05-05 23:10:06 +03:00
parent 21fa38cc4d
commit d069e56397
45 changed files with 550 additions and 31 deletions
@@ -1,3 +1,16 @@
+<<<<<<< HEAD
+import api from './api';
+
+// store our JWT in LS and set axios headers if we do have a token
+
+const setAuthToken = (token) => {
+  if (token) {
+    api.defaults.headers.common['x-auth-token'] = token;
+    localStorage.setItem('token', token);
+  } else {
+    delete api.defaults.headers.common['x-auth-token'];
+    localStorage.removeItem('token');
+=======
 import axios from "axios";

 const setAuthToken = (token) => {
@@ -7,6 +20,7 @@ const setAuthToken = (token) => {
  } else {
    delete axios.defaults.common["x-auth-token"];
    localStorage.removeItem('token')
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
  }
 };