From ad13ef2753dde92aa78bce3b7d8d6d471d0b3025 Mon Sep 17 00:00:00 2001 From: huyt Date: Fri, 14 Jan 2022 20:22:35 +0700 Subject: [PATCH] update code --- app/public/img/logo.png | Bin 0 -> 458 bytes app/public/index.html | 2 +- app/src/App.css | 37 ++ app/src/App.js | 5 +- app/src/actions/boxai/index.js | 9 + app/src/components/LabelImg/LabelImage.js | 18 +- app/src/components/List/ListItem.js | 6 +- app/src/components/Login/Login.js | 22 +- app/src/components/Modal/ModalRole.js | 399 ++++++++++++++++++++++ app/src/components/Modal/ModalUser.js | 70 ++-- app/src/components/Role/Role.js | 295 ++++++++++++++++ app/src/components/Test/Test.js | 4 + app/src/components/User/User.js | 11 +- app/src/components/layouts/Footer.js | 45 +++ app/src/components/layouts/Header.js | 178 ++++++---- app/src/components/layouts/MenuBar.js | 15 +- app/src/reducers/boxai/index.js | 15 + app/src/reducers/index.js | 4 +- 18 files changed, 994 insertions(+), 141 deletions(-) create mode 100644 app/public/img/logo.png create mode 100644 app/src/actions/boxai/index.js create mode 100644 app/src/components/Role/Role.js create mode 100644 app/src/components/layouts/Footer.js create mode 100644 app/src/reducers/boxai/index.js diff --git a/app/public/img/logo.png b/app/public/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c7b6d3b28ad9d61121a7e561875bbdbe3b8e4f6c GIT binary patch literal 458 zcmV;*0X6=KP)bD}w=>YGHdvWb*hpe?0{ z(>^?kq9!;?q+zoGG-wB49b~||Gcer) z^V4;jp3rieZOyYTrUvHOMteT6{J__>d-OKR@l0~G$f-goH(t%)J`oRt9 za519=XE3Wcm)sT1Z$Cp{@{0~9e+8CZNtIFyp78HjaB|{GEtqpng3T`1|6F#?d9N_- z`E~cX8df<5J_R2W^BI+`?F03|U-Um;uGC2IFJZ9m@rq>EXaE2J07*qoM6N<$f)Go_ A^Z)<= literal 0 HcmV?d00001 diff --git a/app/public/index.html b/app/public/index.html index 38f03d5..0547739 100644 --- a/app/public/index.html +++ b/app/public/index.html @@ -34,7 +34,7 @@ - FSI + REVA - AI xử lý ảnh diff --git a/app/src/App.css b/app/src/App.css index 72768df..6258237 100644 --- a/app/src/App.css +++ b/app/src/App.css @@ -472,4 +472,41 @@ button.close:hover { color: #fff; font-weight: 600; font-family: inherit !important; +} + +/* Scrollbar Modal DashBoard styles */ +.scroll::-webkit-scrollbar { + width: 5px; + height: 0px; +} +.scroll::-webkit-scrollbar-track { + box-shadow: inset 0 0 10px #bdc3d4; + border-radius: 10px; +} +.scroll::-webkit-scrollbar-thumb { + border-radius: 10px; + background: #9699a2c7; + box-shadow: inset 0 0 6px #00000020; + padding-left: 10px; +} +.scroll_customer_daily { + max-height: 700px; + overflow-y: scroll; + padding-right: 8px; +} +.scroll_customer_daily:hover { + overflow: overlay; +} +.scroll_customer_vip { + max-height: 100%; + overflow: hidden; + padding-right: 8px; +} +.scroll_customer_vip:hover { + overflow: overlay; +} +.scroll_staff { + max-height: 100%; + overflow: hidden; + padding-right: 8px; } \ No newline at end of file diff --git a/app/src/App.js b/app/src/App.js index 511cda2..7c3b3ac 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -3,11 +3,13 @@ import ListItem from './components/List/ListItem'; import Login from './components/Login/Login'; import LabelImage from './components/LabelImg/LabelImage'; import SearchImage from './components/SearchImg/SearchImage'; +import Role from './components/Role/Role'; import User from './components/User/User'; import ImportImage from './components/ImportImg/ImportImage'; import Test from './components/Test/Test'; import MenuBar from './components/layouts/MenuBar' import Header from './components/layouts/Header' +import Footer from './components/layouts/Footer' import 'antd/dist/antd.css'; import "./App.css"; import { Provider } from 'react-redux'; @@ -28,14 +30,15 @@ function App() { + + {/*