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-20 13:45:17 +07:00
commit 83d9259b52
16 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/App.css
View File

@ -39,7 +39,7 @@
.text-navbar {
/* font-family: inherit; */
font-family: 'Roboto Condensed', sans-serif;
font-family: 'Roboto Condensed Bold', ;
font-weight: 900;
font-size: 15;
color: #fff;

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

@ -1,4 +1,4 @@
import { login } from 'actions/isLogin';
import { login } from '../../actions/isLogin';
import React, { Component } from 'react';
import "react-datepicker/dist/react-datepicker.css";
import { HOST } from '../../config/index';

10
app/src/components/ImportImg/ImportImage.js
View File

@ -59,6 +59,7 @@ class ImportImage extends Component {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
// 'Authorization': token
},
data: {
@ -129,6 +130,7 @@ class ImportImage extends Component {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
// 'Authorization': token
},
body: JSON.stringify({ 'image_obj_id_list': [img._id] })
@ -239,7 +241,7 @@ class ImportImage extends Component {
<div className="m-portlet__head">
<div className="m-portlet__head-caption">
<div className="m-portlet__head-title">
<h3 className="m-portlet__head-text">
<h3 className="font-family-text">
Kho ảnh
</h3>
</div>
@ -283,7 +285,7 @@ class ImportImage extends Component {
className="btn btn-accent m-btn m-btn--icon" id="m_search">
<span>
<i className="la la-search" />
<span>Tìm kiếm</span>
<span className="font-family-text">Tìm kiếm</span>
</span>
</button>
</div>
@ -295,7 +297,7 @@ class ImportImage extends Component {
className="btn btn-secondary m-btn m-btn--icon" id="m_reset">
<span>
<i className="la la-rotate-left" />
<span>Tải lại</span>
<span className="font-family-text">Tải lại</span>
</span>
</button>
</div>
@ -318,7 +320,7 @@ class ImportImage extends Component {
: "" }
</div>
{/*begin: Datatable */}
<table className="table table-striped- table-bordered table-hover table-checkable" id="m_table_1">
<table className="table table-striped- table-bordered table-hover table-checkable font-family-text" id="m_table_1">
<thead>
<tr>
<th style={{width: "50px"}}>STT</th>

3
app/src/components/LabelImg/LabelImage.js
View File

@ -10,6 +10,7 @@ import { HOST } from '../../config/index';
import swal from 'sweetalert';
import { useLocation } from 'react-router-dom';
import { useSelector } from 'react-redux';
import Store from '../../store';
const initialDataPost = {
index: 1,
@ -76,6 +77,7 @@ export default function LabelImage() {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
// 'Authorization': token,
},
data: dataDel,
@ -119,6 +121,7 @@ export default function LabelImage() {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
// 'Authorization': token
},
data: data ? data : dataPost,

3
app/src/components/List/ListItem.js
View File

@ -10,6 +10,7 @@ import { HOST } from '../../config/index';
import swal from 'sweetalert';
import { useLocation } from 'react-router-dom';
import { useSelector } from 'react-redux';
import Store from '../../store';
const initialDataPost = {
index: 1,
@ -74,6 +75,7 @@ export default function ListItem() {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token,
'Authorization': Store.getState().isLogin.access_token,
},
data: dataDel,
})
@ -117,6 +119,7 @@ export default function ListItem() {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
data: data ? data : dataPost,
})

7
app/src/components/Modal/ModaEditLabel.js
View File

@ -9,6 +9,7 @@ import React, { useEffect, useRef, useState } from 'react';
import { Button, Modal } from 'react-bootstrap';
import swal from 'sweetalert';
import { HOST } from '../../config/index';
import Store from '../../store';
@ -85,6 +86,8 @@ const ModalEditLabel = (props) => {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token,
'Authorization': Store.getState().isLogin.access_token,
},
data: dataPost,
})
@ -232,6 +235,8 @@ const ModalEditLabel = (props) => {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
body: JSON.stringify(dataUploadImg)
})
@ -277,6 +282,8 @@ const ModalEditLabel = (props) => {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
// 'Authorization': token
},
body: JSON.stringify({

7
app/src/components/Modal/ModalEdit.js
View File

@ -9,6 +9,7 @@ import React, { useEffect, useRef, useState } from 'react';
import { Button, Modal } from 'react-bootstrap';
import swal from 'sweetalert';
import { HOST } from '../../config/index';
import Store from '../../store';
@ -84,6 +85,8 @@ const Modaledit = (props) => {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
// 'Authorization': token,
},
data: dataPost,
@ -229,6 +232,8 @@ const Modaledit = (props) => {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
// 'Authorization': token
},
body: JSON.stringify(dataUploadImg)
@ -273,7 +278,7 @@ const Modaledit = (props) => {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
body: JSON.stringify({
person_obj_id: crrData._id ? crrData._id : "",

5
app/src/components/Modal/ModalEditImg.js
View File

@ -3,6 +3,7 @@ import moment from 'moment';
import 'moment/locale/vi';
import React, { Component } from 'react';
import { Button, Modal } from 'react-bootstrap';
import Store from '../../store';
import swal from 'sweetalert';
import { HOST } from '../../config/index';
@ -25,11 +26,11 @@ class ModalEditImg extends Component {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
body: JSON.stringify({
"origin_name": this.state.valueImg.origin_name,
"obj_id": this.state.valueImg._id
"obj_id": this.state.valueImg._id,
})
}).then((response) => {
return (

8
app/src/components/Modal/ModalRole.js
View File

@ -5,6 +5,7 @@ import Switch from "react-switch";
import swal from 'sweetalert';
import $ from 'jquery';
import Select from "react-select";
import Store from '../../store';
import { HOST } from '../../config/index';
class ModalRole extends Component {
@ -61,6 +62,7 @@ class ModalRole extends Component {
headers: {
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
body: JSON.stringify(dataPost)
}).then((response) => {
@ -96,7 +98,7 @@ class ModalRole extends Component {
method: 'POST',
headers: {
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
body: JSON.stringify(dataPost)
}).then((response) => {
@ -178,6 +180,8 @@ class ModalRole extends Component {
headers: {
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
}).then((response) => {
return response.json()
@ -196,6 +200,8 @@ class ModalRole extends Component {
headers: {
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
}).then((response) => {
return response.json()

2
app/src/components/Modal/ModalUpload.js
View File

@ -9,6 +9,7 @@ import LoadingOverlay from 'react-loading-overlay';
import { PulseLoader } from 'react-spinners';
import swal from 'sweetalert';
import { HOST } from '../../config/index';
import Store from '../../store';
const { Dragger } = Upload;
@ -40,6 +41,7 @@ const ModalUpload = (props) => {
headers: {
"X-Requested-With": "XMLHttpRequest",
"Content-Type": "application/x-www-form-urlencoded",
'Authorization': Store.getState().isLogin.access_token,
}
})
)

2
app/src/components/Modal/ModalUser.js
View File

@ -9,6 +9,7 @@ import React, { useEffect, useRef, useState } from 'react';
import { Button, Modal } from 'react-bootstrap';
import swal from 'sweetalert';
import { HOST } from '../../config/index';
import Store from '../../store';
const { Option } = Select;
@ -85,6 +86,7 @@ const ModalUser = (props) => {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token,
'Authorization': Store.getState().isLogin.access_token,
},
data: dataPost,
})

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

@ -51,6 +51,7 @@ class Role extends Component {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
}).then((response) => {
return response.json()
@ -91,6 +92,7 @@ class Role extends Component {
method: 'DELETE',
headers: {
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
// 'Authorization': token,
},
}).then((response) => {

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

@ -135,7 +135,7 @@ class SearchImage extends Component {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJjbGFzc2lmeS9sb2dpbiJdLCJleHAiOjE2NDE5NzQ5NjV9.2F2PAUKjpfjPJKzgvzgCDtyBuTXDRl86EnJJGdYgWTM'
'Authorization': Store.getState().isLogin.access_token,
},
body: JSON.stringify({
encodings: this.state.selectedEncoding,
@ -205,6 +205,7 @@ class SearchImage extends Component {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
},
body: JSON.stringify({
image: image_base64

5
app/src/components/User/User.js
View File

@ -12,6 +12,7 @@ import swal from 'sweetalert';
import { useLocation } from 'react-router-dom';
import Switch from "react-switch";
import Select from "react-select";
import Store from '../../store';
import { useSelector } from 'react-redux';
const initialDataPost = {
@ -86,7 +87,7 @@ export default function User() {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token,
'Authorization': Store.getState().isLogin.access_token,
},
})
if (result.data.status === 10000) {
@ -137,7 +138,7 @@ export default function User() {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
// 'Authorization': token
'Authorization': Store.getState().isLogin.access_token,
},
data: data ? data : dataPost,
})

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

@ -29,6 +29,7 @@ class Header extends Component {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': Store.getState().isLogin.access_token,
},
})
.then(response => {

14
app/src/components/layouts/MenuBar.js
View File

@ -51,7 +51,7 @@ class MenuBar extends Component {
<i className="text-navbar m-menu__link-icon flaticon-search-1" />
<span className="m-menu__link-title">
<span className="m-menu__link-wrap">
<span className="text-navbar m-menu__link-text">Tìm kiếm</span>
<span className="text-navbar">Tìm kiếm</span>
</span>
</span>
</NavLink>
@ -64,7 +64,7 @@ class MenuBar extends Component {
<i className="text-navbar m-menu__link-icon flaticon-tabs" />
<span className="m-menu__link-title">
<span className="m-menu__link-wrap">
<span className="text-navbar m-menu__link-text text-navbar">Kho ảnh</span>
<span className="text-navbar">Kho ảnh</span>
</span>
</span>
</NavLink>
@ -77,7 +77,7 @@ class MenuBar extends Component {
<i className="text-navbar m-menu__link-icon flaticon-avatar" />
<span className="m-menu__link-title">
<span className="m-menu__link-wrap">
<span className="text-navbar m-menu__link-text">Người nổi tiếng</span>
<span className="text-navbar">Người nổi tiếng</span>
</span>
</span>
</NavLink>
@ -90,7 +90,7 @@ class MenuBar extends Component {
<i className="text-navbar m-menu__link-icon flaticon-delete" />
<span className="m-menu__link-title">
<span className="m-menu__link-wrap">
<span className="text-navbar m-menu__link-text">Gán nhãn</span>
<span className="text-navbar">Gán nhãn</span>
</span>
</span>
</NavLink>
@ -103,7 +103,7 @@ class MenuBar extends Component {
<i className="text-navbar m-menu__link-icon flaticon-users" />
<span className="m-menu__link-title">
<span className="m-menu__link-wrap">
<span className="text-navbar m-menu__link-text">Quản lý người dùng</span>
<span className="text-navbar">Quản lý người dùng</span>
</span>
</span>
</NavLink>
@ -116,7 +116,7 @@ class MenuBar extends Component {
<i className="text-navbar m-menu__link-icon flaticon-map" />
<span className="m-menu__link-title">
<span className="m-menu__link-wrap">
<span className="text-navbar m-menu__link-text">Thiết lập quyền</span>
<span className="text-navbar">Thiết lập quyền</span>
</span>
</span>
</NavLink>
@ -129,7 +129,7 @@ class MenuBar extends Component {
<i className="text-navbar m-menu__link-icon flaticon-edit" />
<span className="m-menu__link-title">
<span className="m-menu__link-wrap">
<span className="text-navbar m-menu__link-text">Độ chính xác</span>
<span className="text-navbar">Độ chính xác</span>
</span>
</span>
</NavLink>