|
|
|
@ -30,13 +30,12 @@ const UserDropdown = () => {
|
|
|
|
|
const history = useHistory(); |
|
|
|
|
const { user } = useSelector(state => state.authState); |
|
|
|
|
|
|
|
|
|
const handelrLogout = async () => { |
|
|
|
|
const handelrLogout = async e => { |
|
|
|
|
e.preventDefault(); |
|
|
|
|
const { payload } = await dispatch(setLogout()); |
|
|
|
|
console.log(payload); |
|
|
|
|
|
|
|
|
|
if (payload === 'SUCCESS') { |
|
|
|
|
cookieStorage.removeCookie(COOKIE_ACCESS_TOKEN); |
|
|
|
|
cookieStorage.removeCookie(COOKIE_REFRESH_TOKEN); |
|
|
|
|
history.push('/account/login'); |
|
|
|
|
history.replace('/account/login'); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
@ -73,30 +72,38 @@ const UserDropdown = () => {
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
|
<UncontrolledDropdown tag='li' className='dropdown-user nav-item'> |
|
|
|
|
<DropdownToggle |
|
|
|
|
href='/' |
|
|
|
|
tag='a' |
|
|
|
|
className='nav-link dropdown-user-link' |
|
|
|
|
onClick={e => e.preventDefault()} |
|
|
|
|
> |
|
|
|
|
<div className='user-nav d-sm-flex d-none'> |
|
|
|
|
<span className='user-name font-weight-bold'>{user?.memberName}</span> |
|
|
|
|
<span className='user-status'>{user?.authId}</span> |
|
|
|
|
</div> |
|
|
|
|
<Avatar img={userAvatar} imgHeight='40' imgWidth='40' status='online' /> |
|
|
|
|
</DropdownToggle> |
|
|
|
|
<DropdownMenu right> |
|
|
|
|
<DropdownItem |
|
|
|
|
onClick={profileInfo} |
|
|
|
|
tag={Link} |
|
|
|
|
// to='/login'
|
|
|
|
|
to='#' |
|
|
|
|
<> |
|
|
|
|
<UncontrolledDropdown tag='li' className='dropdown-user nav-item'> |
|
|
|
|
<DropdownToggle |
|
|
|
|
href='/' |
|
|
|
|
tag='a' |
|
|
|
|
className='nav-link dropdown-user-link' |
|
|
|
|
onClick={e => e.preventDefault()} |
|
|
|
|
> |
|
|
|
|
<User size={14} className='mr-75' /> |
|
|
|
|
<span className='align-middle'>Profile</span> |
|
|
|
|
</DropdownItem> |
|
|
|
|
{/* <DropdownItem tag={Link} to='#' onClick={e => e.preventDefault()}> |
|
|
|
|
<div className='user-nav d-sm-flex d-none'> |
|
|
|
|
<span className='user-name font-weight-bold'> |
|
|
|
|
{user?.memberName} |
|
|
|
|
</span> |
|
|
|
|
<span className='user-status'>{user?.authId}</span> |
|
|
|
|
</div> |
|
|
|
|
<Avatar |
|
|
|
|
img={userAvatar} |
|
|
|
|
imgHeight='40' |
|
|
|
|
imgWidth='40' |
|
|
|
|
status='online' |
|
|
|
|
/> |
|
|
|
|
</DropdownToggle> |
|
|
|
|
<DropdownMenu right> |
|
|
|
|
<DropdownItem |
|
|
|
|
onClick={profileInfo} |
|
|
|
|
tag={Link} |
|
|
|
|
// to='/login'
|
|
|
|
|
to='#' |
|
|
|
|
> |
|
|
|
|
<User size={14} className='mr-75' /> |
|
|
|
|
<span className='align-middle'>Profile</span> |
|
|
|
|
</DropdownItem> |
|
|
|
|
{/* <DropdownItem tag={Link} to='#' onClick={e => e.preventDefault()}> |
|
|
|
|
<Mail size={14} className='mr-75' /> |
|
|
|
|
<span className='align-middle'>Inbox</span> |
|
|
|
|
</DropdownItem> |
|
|
|
@ -108,17 +115,18 @@ const UserDropdown = () => {
|
|
|
|
|
<MessageSquare size={14} className='mr-75' /> |
|
|
|
|
<span className='align-middle'>Chats</span> |
|
|
|
|
</DropdownItem> */} |
|
|
|
|
<DropdownItem |
|
|
|
|
tag={Link} |
|
|
|
|
// to='/login'
|
|
|
|
|
to='#' |
|
|
|
|
onClick={handelrLogout} |
|
|
|
|
> |
|
|
|
|
<Power size={14} className='mr-75' /> |
|
|
|
|
<span className='align-middle'>Logout</span> |
|
|
|
|
</DropdownItem> |
|
|
|
|
</DropdownMenu> |
|
|
|
|
</UncontrolledDropdown> |
|
|
|
|
<DropdownItem |
|
|
|
|
tag={Link} |
|
|
|
|
// to='/login'
|
|
|
|
|
to='#' |
|
|
|
|
onClick={handelrLogout} |
|
|
|
|
> |
|
|
|
|
<Power size={14} className='mr-75' /> |
|
|
|
|
<span className='align-middle'>Logout</span> |
|
|
|
|
</DropdownItem> |
|
|
|
|
</DropdownMenu> |
|
|
|
|
</UncontrolledDropdown> |
|
|
|
|
</> |
|
|
|
|
); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|