Fix update
This commit is contained in:
@@ -4,8 +4,8 @@ import {AuthContext} from "../../contexts/auth/AuthContext";
|
|||||||
import formatDate from "../../utils/date/formatDate";
|
import formatDate from "../../utils/date/formatDate";
|
||||||
import Task from "../../components/Task/Task";
|
import Task from "../../components/Task/Task";
|
||||||
import SettingsModal from "./components/SettingsModal/SettingsModal";
|
import SettingsModal from "./components/SettingsModal/SettingsModal";
|
||||||
import { useParams } from "react-router";
|
import {useParams} from "react-router";
|
||||||
import { useNavigate } from "react-router";
|
import {useNavigate} from "react-router";
|
||||||
import getUserById from "../../utils/users/getUserById.js";
|
import getUserById from "../../utils/users/getUserById.js";
|
||||||
import ManageMember from "./components/manageMember/ManageMember.jsx";
|
import ManageMember from "./components/manageMember/ManageMember.jsx";
|
||||||
|
|
||||||
@@ -35,21 +35,20 @@ interface AuthContextType {
|
|||||||
update: () => void;
|
update: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function ProfilePage() {
|
function ProfilePage() {
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const { id } = useParams();
|
const {id} = useParams();
|
||||||
const { user, update } = useContext(AuthContext) as AuthContextType;
|
const {user, update} = useContext(AuthContext) as AuthContextType;
|
||||||
const [profileUser, setProfileUser] = useState<User | null>(null);
|
const [profileUser, setProfileUser] = useState<User | null>(null);
|
||||||
|
|
||||||
const isOwnProfile = !id || user.id.toString() === id;
|
const isOwnProfile = !id || user.id.toString() === id;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
update();
|
|
||||||
(async () => {
|
(async () => {
|
||||||
|
|
||||||
if(!isOwnProfile) {
|
if (!isOwnProfile) {
|
||||||
console.log(id);
|
console.log(id);
|
||||||
const res = await getUserById(id);
|
const res = await getUserById(id);
|
||||||
|
|
||||||
@@ -64,9 +63,12 @@ function ProfilePage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setProfileUser(res.data);
|
setProfileUser(res.data);
|
||||||
} else setProfileUser(user)
|
} else {
|
||||||
}) ()
|
update();
|
||||||
}, []);
|
setProfileUser(user)
|
||||||
|
}
|
||||||
|
})()
|
||||||
|
}, [user]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={styles.container}>
|
<div className={styles.container}>
|
||||||
@@ -86,7 +88,7 @@ function ProfilePage() {
|
|||||||
{profileUser?.name} {profileUser?.lastname}
|
{profileUser?.name} {profileUser?.lastname}
|
||||||
</h2>
|
</h2>
|
||||||
{(user?.isAdmin && profileUser && !isOwnProfile) && (
|
{(user?.isAdmin && profileUser && !isOwnProfile) && (
|
||||||
<ManageMember userToManage={profileUser} />
|
<ManageMember userToManage={profileUser}/>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -113,7 +115,7 @@ function ProfilePage() {
|
|||||||
|
|
||||||
{isOwnProfile && (
|
{isOwnProfile && (
|
||||||
<div className={styles.settingImage}>
|
<div className={styles.settingImage}>
|
||||||
<SettingsModal />
|
<SettingsModal/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user