diff --git a/app/src/components/AutoLogin/AutoLogin.js b/app/src/components/AutoLogin/AutoLogin.js index a6de045..ad5b8ea 100644 --- a/app/src/components/AutoLogin/AutoLogin.js +++ b/app/src/components/AutoLogin/AutoLogin.js @@ -30,7 +30,7 @@ class AutoLogin extends Component { headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', - 'Authorization': this.props.match.params.token, + 'Authorization': "Bearer " + this.props.match.params.token, // 'Authorization': token, }, }).then((response) => { diff --git a/app/src/components/SearchImg/SearchImage.js b/app/src/components/SearchImg/SearchImage.js index 7b2cfd0..b0e3c60 100644 --- a/app/src/components/SearchImg/SearchImage.js +++ b/app/src/components/SearchImg/SearchImage.js @@ -1,4 +1,5 @@ import { Card, Image as ImageAntd } from 'antd'; +import Header from 'components/layouts/Header'; import Parser from 'html-react-parser'; import $ from 'jquery'; import React, { Component } from 'react'; @@ -407,130 +408,130 @@ class SearchImage extends Component { return (
-
-
-
-

- Tìm kiếm ảnh -

+
+
+
+

+ Tìm kiếm ảnh +

+
-
-
-
-
-
-
-
- -
- - - +
+
+
+
+
+
+ +
+ + + - -
-
- -
-
-
-
- +
+
+
+ +
+
+
Tổng kết quả {this.state.totalLength}
+
-
-
Tổng kết quả {this.state.totalLength}
+ +
+ {bulletedImg} +
-
- -
- {bulletedImg} - -
+
-
); } diff --git a/app/src/components/layouts/Header.js b/app/src/components/layouts/Header.js index d205450..d136a60 100644 --- a/app/src/components/layouts/Header.js +++ b/app/src/components/layouts/Header.js @@ -13,7 +13,7 @@ class Header extends Component { username : localStorage.getItem('username'), obj_id : localStorage.getItem('obj_id'), isLogin: Store.getState().isLogin.isLogin, - role: Store.getState().role.role, + role: JSON.parse(localStorage.getItem('roles')), access_token: Store.getState().isLogin.access_token, full_name: "" }; @@ -40,7 +40,9 @@ class Header extends Component { Store.dispatch(setbox(data.data.company_id)); localStorage.setItem("roles", JSON.stringify(data.data.roles)); Store.dispatch(role(data.data.roles)); + this.setState({ + role: data.data.roles, full_name: data.data.full_name }) }