local-it/dashboard
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refactor UserModal and CurrentUserModal

Browse source
This commit is contained in:
Davor 2022-05-30 13:12:53 +02:00
parent bc8db8d248
commit a033188b03
13 changed files with 17 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/components/Header/Header.tsx
View file

@ -5,7 +5,9 @@ import { useAuth } from 'src/services/auth';
import Gravatar from 'react-gravatar';
import { Link, useLocation } from 'react-router-dom';
import clsx from 'clsx';
import { CurrentUserModal } from './components/CurrentUserModal';
import _ from 'lodash';
import { UserModal } from '../UserModal';
const navigation = [
{ name: 'Dashboard', to: '/dashboard', requiresAdmin: false },
@ -29,14 +31,20 @@ interface HeaderProps {}
const Header: React.FC<HeaderProps> = () => {
const [currentUserModal, setCurrentUserModal] = useState(false);
const [currentUserId, setCurrentUserId] = useState(null);
const { logOut, currentUser, isAdmin } = useAuth();
const { pathname } = useLocation();
const currentUserModalOpen = () => {
const currentUserModalOpen = (id: any) => {
setCurrentUserId(id);
setCurrentUserModal(true);
};
const currentUserModalClose = () => setCurrentUserModal(false);
const currentUserModalClose = () => {
setCurrentUserModal(false);
setCurrentUserId(null);
};
const navigationItems = filterNavigationByDashboardRole(isAdmin);
@ -106,7 +114,7 @@ const Header: React.FC<HeaderProps> = () => {
<Menu.Item>
{({ active }) => (
<a
onClick={() => currentUserModalOpen()}
onClick={() => currentUserModalOpen(currentUser?.id)}
className={classNames(
active ? 'bg-gray-100 cursor-pointer' : '',
'block px-4 py-2 text-sm text-gray-700 cursor-pointer',
@ -119,7 +127,7 @@ const Header: React.FC<HeaderProps> = () => {
<Menu.Item>
{({ active }) => (
<a
onClick={() => logOut()}
onClick={logOut}
className={classNames(
active ? 'bg-gray-100 cursor-pointer' : '',
'block px-4 py-2 text-sm text-gray-700 cursor-pointer',
@ -160,7 +168,7 @@ const Header: React.FC<HeaderProps> = () => {
)}
</Disclosure>
<CurrentUserModal open={currentUserModal} onClose={currentUserModalClose} user={currentUser} />
<UserModal open={currentUserModal} onClose={currentUserModalClose} userId={currentUserId} setUserId={_.noop} />
</>
);
};