diff --git a/frontend/src/Components/UserInfoModal.tsx b/frontend/src/Components/UserInfoModal.tsx index a22ef01..2334388 100644 --- a/frontend/src/Components/UserInfoModal.tsx +++ b/frontend/src/Components/UserInfoModal.tsx @@ -5,23 +5,38 @@ import UserProjectListAdmin from "./UserProjectListAdmin"; function UserInfoModal(props: { isVisible: boolean; + manageMember: boolean; username: string; onClose: () => void; + onDelete: (username: string) => void; }): JSX.Element { if (!props.isVisible) return <>; - + const ManageUserOrMember = (check: boolean): JSX.Element => { + if (check) { + return ( + +

+ (Change Role) +

+ + ); + } + return ( + +

+ (Change Username) +

+ + ); + }; return (
-
+

{props.username}

- -

- (Change Username) -

- + {ManageUserOrMember(props.manageMember)}

Member of these projects: diff --git a/frontend/src/Components/UserListAdmin.tsx b/frontend/src/Components/UserListAdmin.tsx index 76cae9f..c08b05c 100644 --- a/frontend/src/Components/UserListAdmin.tsx +++ b/frontend/src/Components/UserListAdmin.tsx @@ -1,5 +1,6 @@ import { useState } from "react"; import UserInfoModal from "./UserInfoModal"; +import DeleteUser from "./DeleteUser"; /** * A list of users for admin manage users page, that sets an onClick @@ -29,7 +30,9 @@ export function UserListAdmin(props: { users: string[] }): JSX.Element { return ( <> DeleteUser} isVisible={modalVisible} username={username} />