dungnh/Face_Classify_frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29-

Browse Source
This commit is contained in:
bi 2022-12-23 09:39:02 +07:00
commit 57193a598c
3 changed files with 112 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/components/AutoLogin/AutoLogin.js
View File

@ -30,7 +30,7 @@ class AutoLogin extends Component {
headers: { headers: {
'Accept': 'application/json', 'Accept': 'application/json',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': this.props.match.params.token, 'Authorization': "Bearer " + this.props.match.params.token,
// 'Authorization': token, // 'Authorization': token,
}, },
}).then((response) => { }).then((response) => {

1
app/src/components/SearchImg/SearchImage.js
View File

@ -1,4 +1,5 @@
import { Card, Image as ImageAntd } from 'antd'; import { Card, Image as ImageAntd } from 'antd';
import Header from 'components/layouts/Header';
import Parser from 'html-react-parser'; import Parser from 'html-react-parser';
import $ from 'jquery'; import $ from 'jquery';
import React, { Component } from 'react'; import React, { Component } from 'react';

4
app/src/components/layouts/Header.js
View File

@ -13,7 +13,7 @@ class Header extends Component {
username : localStorage.getItem('username'), username : localStorage.getItem('username'),
obj_id : localStorage.getItem('obj_id'), obj_id : localStorage.getItem('obj_id'),
isLogin: Store.getState().isLogin.isLogin, isLogin: Store.getState().isLogin.isLogin,
role: Store.getState().role.role, role: JSON.parse(localStorage.getItem('roles')),
access_token: Store.getState().isLogin.access_token, access_token: Store.getState().isLogin.access_token,
full_name: "" full_name: ""
}; };
@ -40,7 +40,9 @@ class Header extends Component {
Store.dispatch(setbox(data.data.company_id)); Store.dispatch(setbox(data.data.company_id));
localStorage.setItem("roles", JSON.stringify(data.data.roles)); localStorage.setItem("roles", JSON.stringify(data.data.roles));
Store.dispatch(role(data.data.roles)); Store.dispatch(role(data.data.roles));
this.setState({ this.setState({
role: data.data.roles,
full_name: data.data.full_name full_name: data.data.full_name
}) })
} }