Skip to content

A
Aqbits Trace Code
Commit a0f105fb authored by Trần Ngọc Nam Anh's avatar Trần Ngọc Nam Anh
Browse files
Options

Fix Navbar UI and color

parent 45c3aa7d
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 95 deletions
src/components/Navbars/DemoNavbar.js
View file @ a0f105fb
...@@ -82,57 +82,69 @@ const DemoNavbar = () => { ...@@ -82,57 +82,69 @@ const DemoNavbar = () => {
authServices.logout(); authServices.logout();
history.push("/login-page"); history.push("/login-page");
} }
return ( return (
<> <>
<header className="header-global"> <header className="header-global">
<Navbar <Navbar
className="navbar-main navbar-transparent navbar-light headroom" className="navbar-main navbar-transparent navbar-light headroom"
expand="lg" expand="lg"
id="navbar-main" id="navbar-main"
> >
<Container> <Container>
<NavbarBrand className="mr-lg-5" to="/" tag={Link}> <NavbarBrand className="mr-lg-5" to="/" tag={Link}>
<img <img
alt="..." alt="..."
src={require("assets/img/brand/full_Logo.png")} src={require("assets/img/brand/full_Logo.png")}
/> />
</NavbarBrand> </NavbarBrand>
<button className="navbar-toggler" id="navbar_global"> <button className="navbar-toggler" id="navbar_global">
<span className="navbar-toggler-icon" /> <span className="navbar-toggler-icon" />
</button> </button>
<UncontrolledCollapse <UncontrolledCollapse
toggler="#navbar_global" toggler="#navbar_global"
navbar navbar
className={collapseClasses} className={collapseClasses}
onExiting={onExiting} onExiting={onExiting}
onExited={onExited} onExited={onExited}
> >
<div className="navbar-collapse-header"> <div className="navbar-collapse-header">
<Row> <Row>
<Col className="collapse-brand" xs="6"> <Col className="collapse-brand" xs="6">
<Link to="/"> <Link to="/">
<img <img
alt="..." alt="..."
src={require("assets/img/brand/full_Logo.png")} src={require("assets/img/brand/full_Logo.png")}
/> />
</Link> </Link>
</Col> </Col>
<Col className="collapse-close" xs="6"> <Col className="collapse-close" xs="6">
<button className="navbar-toggler" id="navbar_global"> <button className="navbar-toggler" id="navbar_global">
<span /> <span />
<span /> <span />
</button> </button>
</Col> </Col>
</Row> </Row>
</div> </div>
<Nav className="navbar-nav-hover align-items-lg-center" navbar> <Nav className="navbar-nav-hover align-items-lg-center" navbar>
<UncontrolledDropdown nav> <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> <DropdownToggle nav>
<i className="ni ni-ui-04 d-lg-none mr-1" /> <i className="ni ni-ui-04 d-lg-none mr-1" />
<span className="nav-link-inner--text" onClick={onHandleGoToHome}>Trang chủ</span> <span className="nav-link-inner--text" onClick={onHandleGoToHome}>Trang chủ</span>
</DropdownToggle> </DropdownToggle>
{/* <DropdownMenu className="dropdown-menu-xl"> <DropdownMenu className="dropdown-menu-xl">
<div className="dropdown-menu-inner"> <div className="dropdown-menu-inner">
<Media <Media
className="d-flex align-items-center" className="d-flex align-items-center"
...@@ -189,34 +201,10 @@ const DemoNavbar = () => { ...@@ -189,34 +201,10 @@ const DemoNavbar = () => {
</Media> </Media>
</Media> </Media>
</div> </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> </DropdownMenu>
</UncontrolledDropdown> </UncontrolledDropdown> */}
</Nav> </Nav>
<Nav className="align-items-lg-center ml-lg-auto" navbar> {/* <Nav className="align-items-lg-center ml-lg-auto" navbar>
<NavItem> <NavItem>
<NavLink <NavLink
className="nav-link-icon" className="nav-link-icon"
...@@ -281,13 +269,45 @@ const DemoNavbar = () => { ...@@ -281,13 +269,45 @@ const DemoNavbar = () => {
Github Github
</UncontrolledTooltip> </UncontrolledTooltip>
</NavItem> </NavItem>
</Nav> </Nav> */}
</UncontrolledCollapse> <Nav className="navbar-nav-hover align-items-lg-center ml-lg-auto" navbar>
</Container> <UncontrolledDropdown nav>
</Navbar> <DropdownToggle nav>
</header> <div class="media align-items-center">
</> <span class="avatar avatar-sm rounded-circle">
); <img alt="Image placeholder" src={require("assets/img/theme/team-4-800x800.jpg")}/>
</span>
<div class="media-body ml-2 d-none d-lg-block">
<span class="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/AddProfile.js
View file @ a0f105fb
...@@ -40,7 +40,7 @@ const AddProfile = () => { ...@@ -40,7 +40,7 @@ const AddProfile = () => {
const onHandleAddNewProfile = async (event) => { const onHandleAddNewProfile = async (event) => {
event.preventDefault(); event.preventDefault();
if(validatePhoneNumber(phoneNumber)){ if (validatePhoneNumber(phoneNumber)) {
const getTime = new Date().getTime(); const getTime = new Date().getTime();
const params = { const params = {
id: uuidv4(), id: uuidv4(),
...@@ -56,7 +56,7 @@ const AddProfile = () => { ...@@ -56,7 +56,7 @@ const AddProfile = () => {
dummyData.data.push(params); dummyData.data.push(params);
history.push("/profile"); history.push("/profile");
setValidPhoneNumber(false); setValidPhoneNumber(false);
}else { } else {
setValidPhoneNumber(true); setValidPhoneNumber(true);
} }
} }
...@@ -82,6 +82,7 @@ const AddProfile = () => { ...@@ -82,6 +82,7 @@ const AddProfile = () => {
required required
placeholder="Tên doanh nghiệp" placeholder="Tên doanh nghiệp"
type="text" type="text"
className="text-dark"
value={profileName} value={profileName}
onChange={(e) => setProfileName(e.target.value)} onChange={(e) => setProfileName(e.target.value)}
/> />
...@@ -99,6 +100,7 @@ const AddProfile = () => { ...@@ -99,6 +100,7 @@ const AddProfile = () => {
required required
placeholder="Mã code" placeholder="Mã code"
type="text" type="text"
className="text-dark"
value={profileCode} value={profileCode}
onChange={(e) => setProfileCode(e.target.value)} onChange={(e) => setProfileCode(e.target.value)}
/> />
...@@ -106,7 +108,7 @@ const AddProfile = () => { ...@@ -106,7 +108,7 @@ const AddProfile = () => {
</FormGroup> </FormGroup>
<FormGroup className="mb-4"> <FormGroup className="mb-4">
<Label for="phone_number" >Số điện thoại</Label> <Label for="phone_number" >Số điện thoại</Label>
<InputGroup className="input-group-alternative mb-4"> <InputGroup className="mb-4">
<InputGroupAddon addonType="prepend"> <InputGroupAddon addonType="prepend">
<InputGroupText> <InputGroupText>
<i className="fa fa-phone" /> <i className="fa fa-phone" />
...@@ -115,6 +117,7 @@ const AddProfile = () => { ...@@ -115,6 +117,7 @@ const AddProfile = () => {
<Input <Input
placeholder="Số điện thoại" placeholder="Số điện thoại"
type={phoneNumber ? "text" : "number"} type={phoneNumber ? "text" : "number"}
className="text-dark"
value={phoneNumber} value={phoneNumber}
onChange={(e) => setPhoneNumber(e.target.value)} onChange={(e) => setPhoneNumber(e.target.value)}
invalid={validPhoneNumber} invalid={validPhoneNumber}
...@@ -128,6 +131,7 @@ const AddProfile = () => { ...@@ -128,6 +131,7 @@ const AddProfile = () => {
<Input <Input
placeholder="Địa chỉ" placeholder="Địa chỉ"
type="textarea" type="textarea"
className="text-dark"
value={profileAddress} value={profileAddress}
onChange={(e) => setProfileAddress(e.target.value)} onChange={(e) => setProfileAddress(e.target.value)}
/> />
...@@ -135,7 +139,7 @@ const AddProfile = () => { ...@@ -135,7 +139,7 @@ const AddProfile = () => {
</FormGroup> </FormGroup>
<FormGroup row> <FormGroup row>
<Col sm={10}> <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"> <FormText color="muted">
Lựa chọn logo công ty Lựa chọn logo công ty
</FormText> </FormText>
...@@ -145,18 +149,20 @@ const AddProfile = () => { ...@@ -145,18 +149,20 @@ const AddProfile = () => {
<ProductTable listProduct={detailProfile.profile_product} /> <ProductTable listProduct={detailProfile.profile_product} />
</div> </div>
<div className="d-flex justify-content-between mt-3"> <div className="d-flex justify-content-between mt-3">
<Button <div className="border border-secondary border-3 rounded">
color="info" <Button
type="button" color="secondary"
className="btn-1" type="button"
onClick={onHandleBack} className="btn-1 my-0"
> onClick={onHandleBack}
Quay lại >
</Button> Quay lại
</Button>
</div>
<Button <Button
color="primary" color="primary"
type="submit" type="submit"
className="btn-1" className="btn-1 my-0"
> >
{profileId ? "Sửa" : "Thêm mới"} {profileId ? "Sửa" : "Thêm mới"}
</Button> </Button>
......
src/components/Profile/SearchProfile.js
View file @ a0f105fb
...@@ -53,7 +53,7 @@ const SearchProfile = (props) => { ...@@ -53,7 +53,7 @@ const SearchProfile = (props) => {
<MainBanner /> <MainBanner />
<section className="section pb-0 section-components"> <section className="section pb-0 section-components">
<Container className="mb-5"> <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}> <Form className="justify-content-center" onSubmit={onHandleSearch}>
<FormGroup> <FormGroup>
<InputGroup className="mb-4"> <InputGroup className="mb-4">
......
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