Skip to content

A
Aqbits Trace Code
Commit eef22d3e authored by Mai Thanh Cong's avatar Mai Thanh Cong
Browse files
Options

Merge branch 'develop/NamAnh/Login' of... 

Merge branch 'develop/NamAnh/Login' of https://gitlab.kis-v.com/congmt_kis/aqbits-trace-code into develop/change-ui
parents 6bcaa3cb 3b453e46
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 115 deletions
src/components/Navbars/DemoNavbar.js
View file @ eef22d3e
......@@ -82,57 +82,69 @@ const DemoNavbar = () => {
authServices.logout();
history.push("/login-page");
}
return (
<>
<header className="header-global">
<Navbar
className="navbar-main navbar-transparent navbar-light headroom"
expand="lg"
id="navbar-main"
>
<Container>
<NavbarBrand className="mr-lg-5" to="/" tag={Link}>
<img
alt="..."
src={require("assets/img/brand/full_Logo.png")}
/>
</NavbarBrand>
<button className="navbar-toggler" id="navbar_global">
<span className="navbar-toggler-icon" />
</button>
<UncontrolledCollapse
toggler="#navbar_global"
navbar
className={collapseClasses}
onExiting={onExiting}
onExited={onExited}
>
<div className="navbar-collapse-header">
<Row>
<Col className="collapse-brand" xs="6">
<Link to="/">
<img
alt="..."
src={require("assets/img/brand/full_Logo.png")}
/>
</Link>
</Col>
<Col className="collapse-close" xs="6">
<button className="navbar-toggler" id="navbar_global">
<span />
<span />
</button>
</Col>
</Row>
</div>
<Nav className="navbar-nav-hover align-items-lg-center" navbar>
<UncontrolledDropdown nav>
return (
<>
<header className="header-global">
<Navbar
className="navbar-main navbar-transparent navbar-light headroom"
expand="lg"
id="navbar-main"
>
<Container>
<NavbarBrand className="mr-lg-5" to="/" tag={Link}>
<img
alt="..."
src={require("assets/img/brand/full_Logo.png")}
/>
</NavbarBrand>
<button className="navbar-toggler" id="navbar_global">
<span className="navbar-toggler-icon" />
</button>
<UncontrolledCollapse
toggler="#navbar_global"
navbar
className={collapseClasses}
onExiting={onExiting}
onExited={onExited}
>
<div className="navbar-collapse-header">
<Row>
<Col className="collapse-brand" xs="6">
<Link to="/">
<img
alt="..."
src={require("assets/img/brand/full_Logo.png")}
/>
</Link>
</Col>
<Col className="collapse-close" xs="6">
<button className="navbar-toggler" id="navbar_global">
<span />
<span />
</button>
</Col>
</Row>
</div>
<Nav className="navbar-nav-hover align-items-lg-center" navbar>
<NavItem>
<NavLink
className="nav-link-icon"
href="#"
onClick={onHandleGoToHome}
>
<i className="fa fa-facebook-square d-lg-none" />
<span className="nav-link-inner--text ml-2">
Trang chủ
</span>
</NavLink>
</NavItem>
{/* <UncontrolledDropdown nav>
<DropdownToggle nav>
<i className="ni ni-ui-04 d-lg-none mr-1" />
<span className="nav-link-inner--text" onClick={onHandleGoToHome}>Trang chủ</span>
</DropdownToggle>
{/* <DropdownMenu className="dropdown-menu-xl">
<DropdownMenu className="dropdown-menu-xl">
<div className="dropdown-menu-inner">
<Media
className="d-flex align-items-center"
......@@ -189,34 +201,10 @@ const DemoNavbar = () => {
</Media>
</Media>
</div>
</DropdownMenu> */}
</UncontrolledDropdown>
<UncontrolledDropdown nav>
<DropdownToggle nav>
<i className="ni ni-collection d-lg-none mr-1" />
<span className="nav-link-inner--text">Dịch vụ</span>
</DropdownToggle>
<DropdownMenu>
{/* <DropdownItem to="/trace-code" tag={Link}>
Profile
</DropdownItem> */}
<DropdownItem to="/login-page" tag={Link}>
Đăng nhập
</DropdownItem>
{/* <DropdownItem to="/register-page" tag={Link}>
Đăng kí
</DropdownItem> */}
<DropdownItem to="/" tag={Link}>
Tra cứu thông tin
</DropdownItem>
<DropdownItem divider />
<DropdownItem onClick={onHandleLogout}>
Đăng xuất
</DropdownItem>
</DropdownMenu>
</UncontrolledDropdown>
</Nav>
<Nav className="align-items-lg-center ml-lg-auto" navbar>
</UncontrolledDropdown> */}
</Nav>
{/* <Nav className="align-items-lg-center ml-lg-auto" navbar>
<NavItem>
<NavLink
className="nav-link-icon"
......@@ -281,13 +269,45 @@ const DemoNavbar = () => {
Github
</UncontrolledTooltip>
</NavItem>
</Nav>
</UncontrolledCollapse>
</Container>
</Navbar>
</header>
</>
);
</Nav> */}
<Nav className="navbar-nav-hover align-items-lg-center ml-lg-auto" navbar>
<UncontrolledDropdown nav>
<DropdownToggle nav>
<div className="media align-items-center">
<span className="avatar avatar-sm rounded-circle">
<img alt="Image placeholder" src={require("assets/img/theme/team-4-800x800.jpg")}/>
</span>
<div className="media-body ml-2 d-none d-lg-block">
<span className="mb-0 text-sm font-weight-bold">John Snow</span>
</div>
</div>
</DropdownToggle>
<DropdownMenu>
{/* <DropdownItem to="/trace-code" tag={Link}>
Profile
</DropdownItem> */}
{/* <DropdownItem to="/login-page" tag={Link}>
Đăng nhập
</DropdownItem> */}
{/* <DropdownItem to="/register-page" tag={Link}>
Đăng kí
</DropdownItem> */}
<DropdownItem to="/" tag={Link}>
Tra cứu thông tin
</DropdownItem>
<DropdownItem divider />
<DropdownItem onClick={onHandleLogout}>
Đăng xuất
</DropdownItem>
</DropdownMenu>
</UncontrolledDropdown>
</Nav>
</UncontrolledCollapse>
</Container>
</Navbar>
</header>
</>
);
// }
}
......
src/components/Profile/AddDiary.js deleted 100644 → 0
View file @ 6bcaa3cb
import React from "react";
const AddDiary = () => {
return (
<div></div>
);
}
export default AddDiary;
\ No newline at end of file
src/components/Profile/AddProduct.js
View file @ eef22d3e
......@@ -29,9 +29,6 @@ const AddProduct = () => {
history.push("/profile/add");
}
const newData = dummyData.data.filter(item => item.id === profileId);
console.log("newData", newData);
const onHandleAddProduct = (event) => {
event.preventDefault();
const getTime = new Date().getTime();
......@@ -49,9 +46,7 @@ const AddProduct = () => {
}
if(profileId){
const newData = dummyData.data.filter(item => item.id === profileId);
console.log("newData", newData);
newData.profile_product.push(params);
console.log("newData", newData);
}
history.push("/profile/add");
}
......@@ -77,6 +72,7 @@ const AddProduct = () => {
<Input
placeholder="Tên sản phẩm"
type="text"
className="text-dark"
value={productName}
onChange={(e) => setProductName(e.target.value)}
/>
......@@ -93,6 +89,7 @@ const AddProduct = () => {
<Input
placeholder="Mã sản phẩm"
type="text"
className="text-dark"
value={traceCode}
onChange={(e) => setTraceCode(e.target.value)}
/>
......@@ -109,6 +106,7 @@ const AddProduct = () => {
<Input
placeholder="Giá sản phẩm"
type="text"
className="text-dark"
value={cost}
onChange={(e) => setCost(e.target.value)}
/>
......@@ -125,6 +123,7 @@ const AddProduct = () => {
<Input
placeholder="Xuất xứ"
type="text"
className="text-dark"
value={origin}
onChange={(e) => setOrigin(e.target.value)}
/>
......@@ -136,6 +135,7 @@ const AddProduct = () => {
<Input
placeholder="Mô tả"
type="textarea"
className="text-dark"
value={description}
onChange={(e) => setDescription(e.target.value)}
/>
......@@ -147,6 +147,7 @@ const AddProduct = () => {
<Input
placeholder="Điều kiện nuôi trồng"
type="textarea"
className="text-dark"
value={growingConditions}
onChange={(e) => setGrowingConditions(e.target.value)}
/>
......@@ -154,7 +155,7 @@ const AddProduct = () => {
</FormGroup>
<FormGroup row>
<Col sm={10}>
<Input type="file" name="file" id="file-image" />
<Input type="file" name="file" id="file-image" className="w-auto" />
<FormText color="muted">
Lựa chọn ảnh sản phẩm
</FormText>
......@@ -165,7 +166,7 @@ const AddProduct = () => {
</div>
<div className="d-flex justify-content-between mt-3">
<Button
color="info"
color="secondary"
type="button"
className="btn-1"
onClick={onHandleBack}
......
src/components/Profile/AddProfile.js
View file @ eef22d3e
......@@ -40,7 +40,7 @@ const AddProfile = () => {
const onHandleAddNewProfile = async (event) => {
event.preventDefault();
if(validatePhoneNumber(phoneNumber)){
if (validatePhoneNumber(phoneNumber)) {
const getTime = new Date().getTime();
const params = {
id: uuidv4(),
......@@ -56,7 +56,7 @@ const AddProfile = () => {
dummyData.data.push(params);
history.push("/profile");
setValidPhoneNumber(false);
}else {
} else {
setValidPhoneNumber(true);
}
}
......@@ -82,6 +82,7 @@ const AddProfile = () => {
required
placeholder="Tên doanh nghiệp"
type="text"
className="text-dark"
value={profileName}
onChange={(e) => setProfileName(e.target.value)}
/>
......@@ -99,6 +100,7 @@ const AddProfile = () => {
required
placeholder="Mã code"
type="text"
className="text-dark"
value={profileCode}
onChange={(e) => setProfileCode(e.target.value)}
/>
......@@ -106,7 +108,7 @@ const AddProfile = () => {
</FormGroup>
<FormGroup className="mb-4">
<Label for="phone_number" >Số điện thoại</Label>
<InputGroup className="input-group-alternative mb-4">
<InputGroup className="mb-4">
<InputGroupAddon addonType="prepend">
<InputGroupText>
<i className="fa fa-phone" />
......@@ -115,11 +117,12 @@ const AddProfile = () => {
<Input
placeholder="Số điện thoại"
type={phoneNumber ? "text" : "number"}
className="text-dark"
value={phoneNumber}
onChange={(e) => setPhoneNumber(e.target.value)}
invalid={validPhoneNumber}
/>
<FormFeedback invalid>{validPhoneNumber ? "Phải có 10 chữ số bắt đầu bằng chữ số 0" : false}</FormFeedback>
<FormFeedback invalid>{validPhoneNumber ? "Phải có 10 chữ số bắt đầu bằng chữ số 0" : ""}</FormFeedback>
</InputGroup>
</FormGroup>
<FormGroup className="mb-4">
......@@ -128,6 +131,7 @@ const AddProfile = () => {
<Input
placeholder="Địa chỉ"
type="textarea"
className="text-dark"
value={profileAddress}
onChange={(e) => setProfileAddress(e.target.value)}
/>
......@@ -135,7 +139,7 @@ const AddProfile = () => {
</FormGroup>
<FormGroup row>
<Col sm={10}>
<Input type="file" name="file" id="file-logo" />
<Input type="file" name="file" id="file-logo" className="w-auto" />
<FormText color="muted">
Lựa chọn logo công ty
</FormText>
......@@ -146,7 +150,7 @@ const AddProfile = () => {
</div>
<div className="d-flex justify-content-between mt-3">
<Button
color="info"
color="secondary"
type="button"
className="btn-1"
onClick={onHandleBack}
......
src/components/Profile/DetailProfile.js
View file @ eef22d3e
......@@ -31,7 +31,7 @@ const DetailProfile = (props) => {
{listData && listData.length > 0 ?
listData.map(data => {
return (
<Container>
<Container key={data.id}>
<Row className="row-grid align-items-center">
<Col md={6} >
<div className="d-flex justify-content-center">
......@@ -75,7 +75,7 @@ const DetailProfile = (props) => {
});
}
return (
<Col lg={6} md={12} className="my-3">
<Col lg={6} md={12} className="my-3" key={product.product_id}>
<Card className="w-100 h-100 hover-shadow" onClick={onHandleTraceCode}>
<CardHeader className="h5 mb-3">{product.name}</CardHeader>
<CardBody>
......
src/components/Profile/SearchProfile.js
View file @ eef22d3e
......@@ -53,7 +53,7 @@ const SearchProfile = (props) => {
<MainBanner />
<section className="section pb-0 section-components">
<Container className="mb-5">
<h3 className="h4 text-success mb-4 font-weight-bold text-center">Tra cứu thông tin doanh nghiệp</h3>
<h3 className="h4 text-primary mb-4 font-weight-bold text-center">Tra cứu thông tin doanh nghiệp</h3>
<Form className="justify-content-center" onSubmit={onHandleSearch}>
<FormGroup>
<InputGroup className="mb-4">
......
src/components/Profile/Tracecode.js
View file @ eef22d3e
......@@ -122,7 +122,7 @@ const Tracecode = () => {
<TabPane tabId="plainTabs2">
<div className="description">
{product.product_chain_diary.map(diary => (
<div>
<div key={diary.id}>
<div className="h5 font-weight-bold mt-3">{diary.company}</div>
<Row className="h6 mb-3">
<Col xs={4}>{formatDateTime(diary.date)}</Col>
......@@ -137,7 +137,7 @@ const Tracecode = () => {
<div className="description">
<Row>
{product.product_certification.map((certificate) => (
<Col xs={4}>
<Col xs={4} key={certificate.id}>
<img src={window.location.origin + certificate.image} alt="certificate" height="250px" />
<div className="h5 mt-3 mb-3 font-weight-bold">{certificate.certification_information}</div>
</Col>
......
src/services/ForgotPassword.js
View file @ eef22d3e
......@@ -111,7 +111,7 @@ export default () => {
value={email}
onChange={(e) => setEmail(e.target.value)}
invalid={validEmail} />
<FormFeedback className="bg-transparent shadow-0">{validEmail ? "Không đúng định dạng email" : false}</FormFeedback>
<FormFeedback className="bg-transparent shadow-0">{validEmail === true ? "Không đúng định dạng email" : ""}</FormFeedback>
</InputGroup>
</FormGroup>
<div className="text-center">
......
src/services/ResetPassword.js
View file @ eef22d3e
......@@ -149,7 +149,7 @@ export default () => {
onChange={(e) => setConfirmPassword(e.target.value)}
invalid={checkPassword}
/>
<FormFeedback>{checkPassword ? "Please input match password" : false}</FormFeedback>
<FormFeedback>{checkPassword === true ? "Please input match password" : ""}</FormFeedback>
</InputGroup>
</FormGroup>
<div className="text-center">
......
src/services/Signin.js
View file @ eef22d3e
......@@ -136,7 +136,7 @@ export default () => {
onChange={(e) => setEmail(e.target.value)}
invalid={validEmail}
/>
<FormFeedback className="bg-transparent shadow-0">{validEmail ? "Không đúng định dạng email" : ""}</FormFeedback>
<FormFeedback className="bg-transparent shadow-0">{validEmail === true ? "Không đúng định dạng email" : ""}</FormFeedback>
</InputGroup>
</FormGroup>
<FormGroup id="password">
......
src/services/Signup.js
View file @ eef22d3e
......@@ -125,7 +125,7 @@ export default () => {
value={email}
onChange={(e) => setEmail(e.target.value)}
invalid={validEmail} />
<FormFeedback className="bg-transparent shadow-0">{validEmail ? "Không đúng định dạng email" : false}</FormFeedback>
<FormFeedback className="bg-transparent shadow-0">{validEmail === true ? "Không đúng định dạng email" : ""}</FormFeedback>
</InputGroup>
</FormGroup>
......@@ -145,7 +145,7 @@ export default () => {
onChange={(e) => setPassword(e.target.value)}
invalid={checkPassword}
/>
<FormFeedback>{checkPassword ? "Mật khẩu không trùng nhau" : false}</FormFeedback>
<FormFeedback>{checkPassword === true ? "Mật khẩu không trùng nhau" : ""}</FormFeedback>
</InputGroup>
</FormGroup>
......@@ -166,7 +166,7 @@ export default () => {
onChange={(e) => setConfirmPassword(e.target.value)}
invalid={checkPassword}
/>
<FormFeedback>{checkPassword ? "Mật khẩu không trùng nhau" : false}</FormFeedback>
<FormFeedback>{checkPassword === true ? "Mật khẩu không trùng nhau" : ""}</FormFeedback>
</InputGroup>
</FormGroup>
<div className="text-center">
......
src/views/IndexSections/Table.js
View file @ eef22d3e
......@@ -185,7 +185,6 @@ export const ProfileTable = (props) => {
export const ProductTable = (props) => {
const history = useHistory();
// const dispatch = useDispatch();
console.log("props", props);
const onHandleClickEdit = (productId) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment