diff --git a/frontend/src/Components/ProjectListAdmin.tsx b/frontend/src/Components/ProjectListAdmin.tsx
index 9c98855..6461dae 100644
--- a/frontend/src/Components/ProjectListAdmin.tsx
+++ b/frontend/src/Components/ProjectListAdmin.tsx
@@ -22,10 +22,12 @@ export function ProjectListAdmin(props: {
const [projectName, setProjectName] = useState("");
const [userModalVisible, setUserModalVisible] = useState(false);
const [username, setUsername] = useState("");
+ const [userRole, setUserRole] = useState("");
const [search, setSearch] = useState("");
- const handleClickUser = (username: string): void => {
+ const handleClickUser = (username: string, userRole: string): void => {
setUsername(username);
+ setUserRole(userRole);
setUserModalVisible(true);
};
@@ -41,6 +43,7 @@ export function ProjectListAdmin(props: {
const handleCloseUser = (): void => {
setUsername("");
+ setUserRole("");
setUserModalVisible(false);
};
@@ -59,6 +62,7 @@ export function ProjectListAdmin(props: {
onClose={handleCloseUser}
username={username}
projectName={projectName}
+ role={userRole}
/>
)}
@@ -70,7 +74,7 @@ export function ProjectListAdmin(props: {
setSearch(e.target.value);
}}
/>
-
+
{props.projects
.filter((project) => {
return search.toLowerCase() === ""
diff --git a/frontend/src/Components/UserListAdmin.tsx b/frontend/src/Components/UserListAdmin.tsx
index 13fb6a4..23e49db 100644
--- a/frontend/src/Components/UserListAdmin.tsx
+++ b/frontend/src/Components/UserListAdmin.tsx
@@ -45,7 +45,7 @@ export function UserListAdmin(props: { users: string[] }): JSX.Element {
setSearch(e.target.value);
}}
/>
-
+
{props.users
.filter((user) => {
return search.toLowerCase() === ""
diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
index bc85c5b..8f28ce9 100644
--- a/frontend/src/Components/UserProjectListAdmin.tsx
+++ b/frontend/src/Components/UserProjectListAdmin.tsx
@@ -8,7 +8,7 @@ function UserProjectListAdmin(props: { username: string }): JSX.Element {
GetProjects({ setProjectsProp: setProjects, username: props.username });
return (
-
+
{projects.map((project) => (
-
diff --git a/frontend/src/Pages/AdminPages/AdminManageProjects.tsx b/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
index 080587f..296dc59 100644
--- a/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
+++ b/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
@@ -1,11 +1,11 @@
import { Link } from "react-router-dom";
-import BackButton from "../../Components/BackButton";
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
import { ProjectListAdmin } from "../../Components/ProjectListAdmin";
import { Project } from "../../Types/goTypes";
import GetProjects from "../../Components/GetProjects";
import { useState } from "react";
+import NavButton from "../../Components/NavButton";
function AdminManageProjects(): JSX.Element {
const [projects, setProjects] = useState([]);
@@ -26,7 +26,7 @@ function AdminManageProjects(): JSX.Element {
type="button"
/>
-
+
>
);