diff --git a/app/src/App.css b/app/src/App.css index 72e5104..33f5a6a 100644 --- a/app/src/App.css +++ b/app/src/App.css @@ -39,9 +39,9 @@ .text-navbar { /* font-family: inherit; */ - font-family: 'Roboto Condensed Bold', ; - font-weight: 900; - font-size: 15; + font-family: 'Roboto Condensed', ; + font-weight: 600; + font-size: 25; color: #fff; } diff --git a/app/src/components/ImportImg/ImportImage.js b/app/src/components/ImportImg/ImportImage.js index 3916ede..375ddb2 100644 --- a/app/src/components/ImportImg/ImportImage.js +++ b/app/src/components/ImportImg/ImportImage.js @@ -282,7 +282,7 @@ class ImportImage extends Component { activePage: 1 }) }} - className="btn btn-accent m-btn m-btn--icon" id="m_search"> + className="btn btn-primary m-btn m-btn--icon" style={{backgroundColor: '#2673b4'}} id="m_search"> Tìm kiếm @@ -310,10 +310,11 @@ class ImportImage extends Component { modalUploadShow: true, }) }} - className="btn btn-accent m-btn m-btn--custom m-btn--icon m-btn--pill m-btn--air"> + style={{backgroundColor: '#2673b4'}} + className="btn btn-primary m-btn m-btn--custom m-btn--icon m-btn--pill m-btn--air"> - Tải ảnh lên + Tải ảnh lên @@ -321,8 +322,9 @@ class ImportImage extends Component { {/*begin: Datatable */} - - + + + diff --git a/app/src/components/LabelImg/LabelImage.js b/app/src/components/LabelImg/LabelImage.js index b25f282..d7c7a8c 100644 --- a/app/src/components/LabelImg/LabelImage.js +++ b/app/src/components/LabelImg/LabelImage.js @@ -264,7 +264,7 @@ export default function LabelImage() { setActivePage(1) getData(dataPost) }} - className="btn btn-accent m-btn m-btn--icon" id="m_search"> + className="btn btn-primary m-btn m-btn--icon" id="m_search" style={{backgroundColor: '#2673b4'}}> Tìm kiếm @@ -300,7 +300,7 @@ export default function LabelImage() { setDataEdit(dataEdit) setShowModal(true) }} - className="btn btn-accent m-btn m-btn--custom m-btn--icon m-btn--pill m-btn--air"> + className="btn btn-primary m-btn m-btn--custom m-btn--icon m-btn--pill m-btn--air" style={{backgroundColor: '#2673b4'}}> Thêm mới @@ -310,8 +310,9 @@ export default function LabelImage() { {/*begin: Datatable */}
STT Ảnh Tên ảnh
- - + + + diff --git a/app/src/components/List/ListItem.js b/app/src/components/List/ListItem.js index c7df15d..45d0530 100644 --- a/app/src/components/List/ListItem.js +++ b/app/src/components/List/ListItem.js @@ -258,7 +258,7 @@ export default function ListItem() { setActivePage(1) getData(dataPost) }} - className="btn btn-accent m-btn m-btn--icon" id="m_search"> + className="btn btn-primary m-btn m-btn--icon" id="m_search" style={{backgroundColor: '#2673b4'}}> Tìm kiếm @@ -294,7 +294,8 @@ export default function ListItem() { setDataEdit(dataEdit) setShowModal(true) }} - className="btn btn-accent m-btn m-btn--custom m-btn--icon m-btn--pill m-btn--air"> + style={{backgroundColor: '#2673b4'}} + className="btn btn-primary m-btn m-btn--custom m-btn--icon m-btn--pill m-btn--air"> Thêm mới @@ -304,8 +305,8 @@ export default function ListItem() { {/*begin: Datatable */}
Ảnh Họ tên FacebookID
- - + + diff --git a/app/src/components/Modal/ModalPassword.js b/app/src/components/Modal/ModalPassword.js index 12d05bf..1a4849d 100644 --- a/app/src/components/Modal/ModalPassword.js +++ b/app/src/components/Modal/ModalPassword.js @@ -5,6 +5,7 @@ import React from 'react'; import { Button, Modal } from 'react-bootstrap'; import swal from 'sweetalert'; import { HOST } from '../../config/index'; +import Store from '../../store'; const ModalPassword = (props) => { const { show, onHide, obj_id } = props; @@ -14,7 +15,11 @@ const ModalPassword = (props) => { const click_handle = async () => { let dataPost = {password: form.getFieldValue('password')} console.log(dataPost, obj_id) - const result = await axios.patch(`${HOST}/api/users/${obj_id}/password`, { password: form.getFieldValue('password') }) + const headers = { + 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, + } + const result = await axios.patch(`${HOST}/api/users/${obj_id}/password`,{headers} ,{ password: form.getFieldValue('password') }) if (result.data.status === 10000) { swal({ icon: 'success', diff --git a/app/src/components/Modal/ModalUser.js b/app/src/components/Modal/ModalUser.js index 8fa4692..0693dd3 100644 --- a/app/src/components/Modal/ModalUser.js +++ b/app/src/components/Modal/ModalUser.js @@ -53,7 +53,11 @@ const ModalUser = (props) => { const getLevel = async () => { - let result = await axios.get(`${HOST}/api/levels/company/1`) + const headers = { + 'Content-Type': 'application/json', + 'Authorization': Store.getState().isLogin.access_token, + } + let result = await axios.get(`${HOST}/api/levels/company/1`, {headers} ) if (result.data.status === 10000) { var listOptions = [] for (let i = 0; i < result.data.data.length; i++) { diff --git a/app/src/components/Role/Role.js b/app/src/components/Role/Role.js index 23036e7..4850b5a 100644 --- a/app/src/components/Role/Role.js +++ b/app/src/components/Role/Role.js @@ -233,7 +233,7 @@ class Role extends Component { }, modalRole: true, }); - }} className="btn btn-accent m-btn m-btn--custom m-btn--icon m-btn--pill m-btn--air"> + }} className="btn btn-primary m-btn--custom m-btn--icon" style={{backgroundColor:'#2673b4'}}> Thêm mới @@ -249,12 +249,12 @@ class Role extends Component {
Ảnh Họ tên Giới tính
- + {/* */} - {(this.state.dataRole?.indexOf('level:edit') === -1 && this.state.dataRole?.indexOf('level:delete') === -1) ? "" : } + {(this.state.dataRole?.indexOf('level:edit') === -1 && this.state.dataRole?.indexOf('level:delete') === -1) ? "" : } diff --git a/app/src/components/SearchImg/SearchImage.js b/app/src/components/SearchImg/SearchImage.js index ecc1f6c..7b2cfd0 100644 --- a/app/src/components/SearchImg/SearchImage.js +++ b/app/src/components/SearchImg/SearchImage.js @@ -482,10 +482,10 @@ class SearchImage extends Component { this.getPerson(); }) }} - className="btn btn-accent m-btn m-btn--icon"> + className="btn btn-sm btn-primary m-btn--icon" style={{backgroundColor: '#2673b4'}}> - Tìm kiếm + Tìm kiếm diff --git a/app/src/components/Test/Test.js b/app/src/components/Test/Test.js index a9f9a2b..cf73261 100644 --- a/app/src/components/Test/Test.js +++ b/app/src/components/Test/Test.js @@ -53,7 +53,7 @@ export default function Test() {
- +
+ className="btn btn-primary m-btn m-btn--icon" style={{backgroundColor: '#2673b4'}} id="m_search"> Tìm kiếm diff --git a/app/src/components/layouts/MenuBar.js b/app/src/components/layouts/MenuBar.js index ac5c9e0..09f7eba 100644 --- a/app/src/components/layouts/MenuBar.js +++ b/app/src/components/layouts/MenuBar.js @@ -48,10 +48,10 @@ class MenuBar extends Component { {this.state.dataRole?.indexOf('search:view') !== -1 ?
  • this.onClickClose()}> - + - Tìm kiếm + Tìm kiếm @@ -64,7 +64,7 @@ class MenuBar extends Component { - Kho ảnh + Kho ảnh @@ -74,10 +74,10 @@ class MenuBar extends Component { {this.state.dataRole?.indexOf('famous:view') !== -1 ?
  • this.onClickClose()}> - + - Người nổi tiếng + Người nổi tiếng @@ -87,54 +87,54 @@ class MenuBar extends Component { {this.state.dataRole?.indexOf('person:view') !== -1 ?
  • this.onClickClose()}> - + - Gán nhãn + Gán nhãn
    • : ""} - {this.state.dataRole?.indexOf('user:view') !== -1 ? + {/* {this.state.dataRole?.indexOf('user:view') !== -1 ?
  • this.onClickClose()}> - + - Quản lý người dùng + Quản lý người dùng
    • - : ""} + : ""} */} - {this.state.dataRole?.indexOf('level:view') !== -1 ? + {/* {this.state.dataRole?.indexOf('level:view') !== -1 ?
  • this.onClickClose()}> - + - Thiết lập quyền + Thiết lập quyền
    • - : ""} + : ""} */} - {this.state.dataRole?.indexOf('level:view') !== -1 ? + {/* {this.state.dataRole?.indexOf('level:view') !== -1 ?
  • this.onClickClose()}> - + - Độ chính xác + Độ chính xác
    • - : ""} + : ""} */}
    {/* END: Aside Menu */}
    STT TênTrạng tháiThao tácThao tác