+ <>
{showModal &&
}
+
+
)
}
diff --git a/app/src/components/List/ListItem.js b/app/src/components/List/ListItem.js
index 19fd3ef..d7befcd 100644
--- a/app/src/components/List/ListItem.js
+++ b/app/src/components/List/ListItem.js
@@ -9,6 +9,7 @@ import { PulseLoader } from 'react-spinners';
import { HOST } from '../../config/index';
import swal from 'sweetalert';
import { useLocation } from 'react-router-dom';
+import { useSelector } from 'react-redux';
const initialDataPost = {
index: 1,
@@ -28,10 +29,11 @@ export default function ListItem() {
const [activePage, setActivePage] = useState(1)
const [totalItems, setTotalItems] = useState(0)
+ const token = useSelector(state => state.isLogin.access_token);
+
const [dataPost, setDataPost] = useState(initialDataPost)
const itemsPerPage = 5
- const [token, setToken] = useState('');
const location = useLocation();
@@ -43,8 +45,6 @@ export default function ListItem() {
let arr = value.split('=');
obj[arr[0]] = arr[1]
})
- setToken(decodeURIComponent(obj.token))
- setToken((obj.token))
}
}, [location])
diff --git a/app/src/components/Login/Login.js b/app/src/components/Login/Login.js
index e4b109d..24b55fd 100644
--- a/app/src/components/Login/Login.js
+++ b/app/src/components/Login/Login.js
@@ -5,7 +5,8 @@ import $ from 'jquery';
import { HOST } from '../../config';
import Store from '../../store';
import { login } from '../../actions/isLogin';
-
+import { role } from '../../actions/role';
+import { setbox } from '../../actions/boxai';
class Login extends Component {
constructor(props) {
super(props);
@@ -13,7 +14,7 @@ class Login extends Component {
error: 0,
loadingbtn: false,
datalogin: {
- email: "",
+ username: "",
password: "",
}
}
@@ -38,7 +39,7 @@ class Login extends Component {
loadingbtn: false
})
} else {
- fetch(`${HOST}/api/login`, {
+ fetch(`${HOST}/api/users/login`, {
method: 'POST',
headers: {
'Accept': 'application/json',
@@ -57,14 +58,19 @@ class Login extends Component {
return response.json()
}).then((data) => {
if (data.status === 10000) {
+ console.log(data)
+ console.log(data.data.roles)
this.setState({
error: 0,
loadingbtn: false
+ }, () => {
+ Store.dispatch(role(data.data.roles));
})
localStorage.setItem("access_token", "Bearer " + data.access_token);
Store.dispatch(login("Bearer " + data.access_token));
- localStorage.setItem("api_url", data.api_url);
- localStorage.setItem("api2_url", data.api2_url);
+ Store.dispatch(setbox(data.data.company_id));
+ localStorage.setItem("username", data.data.username);
+ localStorage.setItem("obj_id", data.data._id);
window.location.href = "/";
// return;
} else if (data.status === 10003) {
@@ -125,11 +131,11 @@ class Login extends Component {