Merge branch 'feature/TKA-29-' of gitea.beetai.com:huyt/fsi_project into feature/TKA-29-
This commit is contained in:
bi
commit
d7f1882cf3
|
|
@ -40,8 +40,8 @@
|
||||||
.text-navbar {
|
.text-navbar {
|
||||||
/* font-family: inherit; */
|
/* font-family: inherit; */
|
||||||
font-family: 'Roboto Condensed', ;
|
font-family: 'Roboto Condensed', ;
|
||||||
font-weight: 600;
|
font-weight: 400;
|
||||||
font-size: 25;
|
font-size: 23;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -130,51 +130,55 @@ class Header extends Component {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<li className="m-nav__item m-dropdown m-dropdown--medium m-dropdown--arrow m-dropdown--align-right m-dropdown--mobile-full-width m-dropdown--skin-light icon_logout" m-dropdown-toggle="click">
|
{
|
||||||
<a href="#" className="m-nav__link m-dropdown__toggle">
|
this.state.obj_id ? (
|
||||||
<span className="m-topbar__userpic">
|
<li className="m-nav__item m-dropdown m-dropdown--medium m-dropdown--arrow m-dropdown--align-right m-dropdown--mobile-full-width m-dropdown--skin-light icon_logout" m-dropdown-toggle="click">
|
||||||
<img src="/img/photo-placeholder.png" className="m--img-rounded m--marginless m--img-centered" alt="" />
|
<a href="#" className="m-nav__link m-dropdown__toggle">
|
||||||
</span>
|
<span className="m-topbar__userpic">
|
||||||
<span className="m-nav__link-icon m-topbar__usericon m--hide">
|
<img src="/img/photo-placeholder.png" className="m--img-rounded m--marginless m--img-centered" alt="" />
|
||||||
<span className="m-nav__link-icon-wrapper"><i className="flaticon-user-ok" /></span>
|
</span>
|
||||||
</span>
|
<span className="m-nav__link-icon m-topbar__usericon m--hide">
|
||||||
</a>
|
<span className="m-nav__link-icon-wrapper"><i className="flaticon-user-ok" /></span>
|
||||||
<div className="m-dropdown__wrapper">
|
</span>
|
||||||
<span className="m-dropdown__arrow m-dropdown__arrow--right m-dropdown__arrow--adjust" />
|
</a>
|
||||||
<div className="m-dropdown__inner">
|
<div className="m-dropdown__wrapper">
|
||||||
<div className="m-dropdown__header m--align-center">
|
<span className="m-dropdown__arrow m-dropdown__arrow--right m-dropdown__arrow--adjust" />
|
||||||
<div className="m-card-user m-card-user--skin-light">
|
<div className="m-dropdown__inner">
|
||||||
<div className="m-card-user__pic">
|
<div className="m-dropdown__header m--align-center">
|
||||||
<img src="/img/photo-placeholder.png" className="m--img-rounded m--marginless" alt="" />
|
<div className="m-card-user m-card-user--skin-light">
|
||||||
</div>
|
<div className="m-card-user__pic">
|
||||||
<div className="m-card-user__details">
|
<img src="/img/photo-placeholder.png" className="m--img-rounded m--marginless" alt="" />
|
||||||
<span className="font-family-text m-card-user__name m--font-weight-500">{this.state.username}</span>
|
</div>
|
||||||
<div href="#/" className="m-card-user__email m--font-weight-300 m-link"><span className='font-family-text'>{this.state.full_name}</span></div>
|
<div className="m-card-user__details">
|
||||||
|
<span className="font-family-text m-card-user__name m--font-weight-500">{this.state.username}</span>
|
||||||
|
<div href="#/" className="m-card-user__email m--font-weight-300 m-link"><span className='font-family-text'>{this.state.full_name}</span></div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="m-dropdown__body">
|
||||||
|
<div className="m-dropdown__content">
|
||||||
|
<ul className="m-nav m-nav--skin-light">
|
||||||
|
<li className="m-nav__separator m-nav__separator--fit">
|
||||||
|
</li>
|
||||||
|
<li className="m-nav__item">
|
||||||
|
<a className="btn m-btn--pill btn-secondary m-btn m-btn--custom m-btn--label-brand m-btn--bolder"
|
||||||
|
onClick={() => {
|
||||||
|
localStorage.removeItem("access_token");
|
||||||
|
window.location.href = "/login";
|
||||||
|
}}
|
||||||
|
><span className='font-family-text'>
|
||||||
|
Đăng Xuất
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="m-dropdown__body">
|
</li>
|
||||||
<div className="m-dropdown__content">
|
) : null
|
||||||
<ul className="m-nav m-nav--skin-light">
|
}
|
||||||
<li className="m-nav__separator m-nav__separator--fit">
|
|
||||||
</li>
|
|
||||||
<li className="m-nav__item">
|
|
||||||
<a className="btn m-btn--pill btn-secondary m-btn m-btn--custom m-btn--label-brand m-btn--bolder"
|
|
||||||
onClick={() => {
|
|
||||||
localStorage.removeItem("access_token");
|
|
||||||
window.location.href = "/login";
|
|
||||||
}}
|
|
||||||
><span className='font-family-text'>
|
|
||||||
Đăng Xuất
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ class MenuBar extends Component {
|
||||||
{this.state.dataRole?.indexOf('search:view') !== -1 ?
|
{this.state.dataRole?.indexOf('search:view') !== -1 ?
|
||||||
<li className="m-menu__item m-menu__item--submenu" aria-haspopup="true" m-menu-submenu-toggle="hover">
|
<li className="m-menu__item m-menu__item--submenu" aria-haspopup="true" m-menu-submenu-toggle="hover">
|
||||||
<NavLink to="/search-image" className={"m-menu__link " + active} activeClassName="m-menu__item--active" onClick={() => this.onClickClose()}>
|
<NavLink to="/search-image" className={"m-menu__link " + active} activeClassName="m-menu__item--active" onClick={() => this.onClickClose()}>
|
||||||
<i className="text-navbar m-menu__link-icon fa fa-search" />
|
<i className="m-menu__link-icon fa fa-search" style={{color: 'white'}} />
|
||||||
<span className="m-menu__link-title">
|
<span className="m-menu__link-title">
|
||||||
<span className="m-menu__link-wrap">
|
<span className="m-menu__link-wrap">
|
||||||
<span className="text-navbar" style={{fontSize: 20, fontFamily: 'Roboto'}}>Tìm kiếm</span>
|
<span className="text-navbar" style={{fontSize: 20, fontFamily: 'Roboto'}}>Tìm kiếm</span>
|
||||||
|
|
@ -61,7 +61,7 @@ class MenuBar extends Component {
|
||||||
{this.state.dataRole?.indexOf('import:view') !== -1 ?
|
{this.state.dataRole?.indexOf('import:view') !== -1 ?
|
||||||
<li className="m-menu__item m-menu__item--submenu" aria-haspopup="true" m-menu-submenu-toggle="hover">
|
<li className="m-menu__item m-menu__item--submenu" aria-haspopup="true" m-menu-submenu-toggle="hover">
|
||||||
<NavLink to="/import-image" className={"m-menu__link " + active} activeClassName="m-menu__item--active" onClick={() => this.onClickClose()}>
|
<NavLink to="/import-image" className={"m-menu__link " + active} activeClassName="m-menu__item--active" onClick={() => this.onClickClose()}>
|
||||||
<i className="text-navbar m-menu__link-icon flaticon-tabs" />
|
<i className="m-menu__link-icon fa fa-file-image" style={{color: 'white'}} />
|
||||||
<span className="m-menu__link-title">
|
<span className="m-menu__link-title">
|
||||||
<span className="m-menu__link-wrap">
|
<span className="m-menu__link-wrap">
|
||||||
<span className="text-navbar" style={{fontSize: 20, fontFamily: 'Roboto'}}>Kho ảnh</span>
|
<span className="text-navbar" style={{fontSize: 20, fontFamily: 'Roboto'}}>Kho ảnh</span>
|
||||||
|
|
@ -74,7 +74,7 @@ class MenuBar extends Component {
|
||||||
{this.state.dataRole?.indexOf('famous:view') !== -1 ?
|
{this.state.dataRole?.indexOf('famous:view') !== -1 ?
|
||||||
<li className="m-menu__item m-menu__item--submenu" aria-haspopup="true" m-menu-submenu-toggle="hover">
|
<li className="m-menu__item m-menu__item--submenu" aria-haspopup="true" m-menu-submenu-toggle="hover">
|
||||||
<NavLink to="/list-famous" className={"m-menu__link " + active} activeClassName="m-menu__item--active" onClick={() => this.onClickClose()}>
|
<NavLink to="/list-famous" className={"m-menu__link " + active} activeClassName="m-menu__item--active" onClick={() => this.onClickClose()}>
|
||||||
<i className="text-navbar m-menu__link-icon fa fa-user-tie mr-2" />
|
<i className="m-menu__link-icon fa fa-user-tie mr-2" style={{color: 'white'}} />
|
||||||
<span className="m-menu__link-title">
|
<span className="m-menu__link-title">
|
||||||
<span className="m-menu__link-wrap">
|
<span className="m-menu__link-wrap">
|
||||||
<span className="text-navbar" style={{fontSize: 20, fontFamily: 'Roboto'}}>Người nổi tiếng</span>
|
<span className="text-navbar" style={{fontSize: 20, fontFamily: 'Roboto'}}>Người nổi tiếng</span>
|
||||||
|
|
@ -87,7 +87,7 @@ class MenuBar extends Component {
|
||||||
{this.state.dataRole?.indexOf('person:view') !== -1 ?
|
{this.state.dataRole?.indexOf('person:view') !== -1 ?
|
||||||
<li className="m-menu__item m-menu__item--submenu" aria-haspopup="true" m-menu-submenu-toggle="hover">
|
<li className="m-menu__item m-menu__item--submenu" aria-haspopup="true" m-menu-submenu-toggle="hover">
|
||||||
<NavLink to="/label-image" className={"m-menu__link " + active} activeClassName="m-menu__item--active" onClick={() => this.onClickClose()}>
|
<NavLink to="/label-image" className={"m-menu__link " + active} activeClassName="m-menu__item--active" onClick={() => this.onClickClose()}>
|
||||||
<i className="text-navbar m-menu__link-icon fa fa-tags" />
|
<i className="m-menu__link-icon fa fa-tags" style={{color: 'white'}} />
|
||||||
<span className="m-menu__link-title">
|
<span className="m-menu__link-title">
|
||||||
<span className="m-menu__link-wrap">
|
<span className="m-menu__link-wrap">
|
||||||
<span className="text-navbar" style={{fontSize: 20, fontFamily: 'Roboto'}}>Gán nhãn</span>
|
<span className="text-navbar" style={{fontSize: 20, fontFamily: 'Roboto'}}>Gán nhãn</span>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user