Some fixes to design and comments

frontend/src/Components/AddProject.tsx

@@ -61,24 +61,26 @@ function AddProject(): JSX.Element {
           <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
             Create a new project
           </h3>
-          <InputField
+          <div className="space-y-3">
-            label="Name"
+            <InputField
-            type="text"
+              label="Name"
-            value={name}
+              type="text"
-            onChange={(e) => {
+              value={name}
-              e.preventDefault();
+              onChange={(e) => {
-              setName(e.target.value);
+                e.preventDefault();
-            }}
+                setName(e.target.value);
-          />
+              }}
-          <InputField
+            />
-            label="Description"
+            <InputField
-            type="text"
+              label="Description"
-            value={description}
+              type="text"
-            onChange={(e) => {
+              value={description}
-              e.preventDefault();
+              onChange={(e) => {
-              setDescription(e.target.value);
+                e.preventDefault();
-            }}
+                setDescription(e.target.value);
-          />
+              }}
+            />
+          </div>
           <div className="flex items-center justify-between">
             <Button
               text="Create"

frontend/src/Components/AddUserToProject.tsx

@@ -8,7 +8,7 @@ import BackButton from "./BackButton";
  * Provides UI for adding a member to a project.
  * @returns {JSX.Element} - Returns the component UI for adding a member
  */
-function AddUserToProject(): JSX.Element {
+function AddUserToProject(props: { projectName: string }): JSX.Element {
   const [name, setName] = useState("");
   const [users, setUsers] = useState<string[]>([]);
   const [role, setRole] = useState("");
@@ -17,7 +17,7 @@ function AddUserToProject(): JSX.Element {
   const handleClick = (): boolean => {
     const newMember: NewProjMember = {
       username: name,
-      projectname: localStorage.getItem("projectName") ?? "",
+      projectname: props.projectName,
       role: role,
     };
     return AddMember({ memberToAdd: newMember });
@@ -32,13 +32,13 @@ function AddUserToProject(): JSX.Element {
         Role chosen: [{role}]
       </p>
       <p className="pb-4 mb-2 text-center font-bold text-[18px]">
-        Project chosen: [{localStorage.getItem("projectName") ?? ""}]
+        Project chosen: [{props.projectName}]
       </p>
       <p className="p-1">Choose role:</p>
-      <div className="border-2 border-black p-2 rounded-xl text-center h-[10h] w-[16vh]">
+      <div className="border-2 border-black p-2 rounded-xl text-center h-[10h] w-[16] overflow-auto">
         <ul className="text-center items-center font-medium space-y-2">
           <li
-            className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+            className="h-[10] w-[14] items-start px-2 py-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
             onClick={() => {
               setRole("member");
             }}
@@ -46,7 +46,7 @@ function AddUserToProject(): JSX.Element {
             {"Member"}
           </li>
           <li
-            className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+            className="h-[10] w-[14] items-start px-2 py-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
             onClick={() => {
               setRole("project_manager");
             }}

frontend/src/Components/ChangeRoleView.tsx

@@ -31,13 +31,10 @@ export default function ChangeRoles(props: {
   };
 
   return (
-    <div>
+    <div className="overflow-auto rounded-lg">
-      <h1 className="font-bold text-[22px] mb-[15px]">Change role:</h1>
+      <h1 className="font-bold text-[20px]">Select role:</h1>
-      <form
+      <form onSubmit={handleSubmit}>
-        className="border-2 border-black rounded-lg p-2"
+        <div className="h-[7vh] self-start text-left font-medium overflow-auto border-2 border-black rounded-lg p-2">
-        onSubmit={handleSubmit}
-      >
-        <div className="self-start text-left font-medium">
           <div className="hover:font-bold">
             <label>
               <input
@@ -45,7 +42,7 @@ export default function ChangeRoles(props: {
                 value="project_manager"
                 checked={selectedRole === "project_manager"}
                 onChange={handleRoleChange}
-                className="ml-2 mr-2 mb-5"
+                className="ml-2 mr-2 mb-3"
               />
               Project manager
             </label>
@@ -63,7 +60,6 @@ export default function ChangeRoles(props: {
             </label>
           </div>
         </div>
-
         <Button
           text="Change"
           onClick={(): void => {

frontend/src/Components/GetProjects.tsx

@@ -4,11 +4,13 @@ import { api } from "../API/API";
 
 /**
  * Gets all projects that user is a member of
- * @param props - A setStateAction for the array you want to put projects in
+ * @param {Dispatch} props.setProjectsProp - A setStateAction for the array you want to put projects in
+ * @param {string} props.username - Username
  * @returns {void} Nothing
  * @example
+ *  const username = "Example";
  *  const [projects, setProjects] = useState<Project[]>([]);
- *  GetAllUsers({ setProjectsProp: setProjects });
+ *  GetProjects({ setProjectsProp: setProjects, username: username });
  */
 function GetProjects(props: {
   setProjectsProp: Dispatch<React.SetStateAction<Project[]>>;

frontend/src/Components/GetUsersInProject.tsx

@@ -7,12 +7,13 @@ export interface ProjectMember {
 }
 
 /**
- * Gets all projects that user is a member of
+ * Gets all members of a project
- * @param props - A setStateAction for the array you want to put projects in
+ * @param string - The project's name
+ * @param Dispatch - A setStateAction for the array you want to put members in
  * @returns {void} Nothing
  * @example
- *  const [projects, setProjects] = useState<Project[]>([]);
+ * const [users, setUsers] = useState<User[]>([]);
- *  GetAllUsers({ setProjectsProp: setProjects });
+ * GetUsersInProject({ projectName: props.projectname, setUsersProp: setUsers });
  */
 function GetUsersInProject(props: {
   projectName: string;
@@ -28,10 +29,10 @@ function GetUsersInProject(props: {
         if (response.success) {
           setUsers(response.data ?? []);
         } else {
-          console.error("Failed to fetch projects:", response.message);
+          console.error("Failed to fetch members:", response.message);
         }
       } catch (error) {
-        console.error("Error fetching projects:", error);
+        console.error("Error fetching members:", error);
       }
     };
     void fetchUsers();

frontend/src/Components/InputField.tsx

@@ -19,7 +19,7 @@ function InputField(props: {
   onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
 }): JSX.Element {
   return (
-    <div className="mb-4">
+    <div className="">
       <label
         className="block text-gray-700 text-sm font-sans font-bold mb-2"
         htmlFor={props.label}

frontend/src/Components/MemberInfoModal.tsx

@@ -5,12 +5,11 @@ import { useState } from "react";
 import ChangeRoleView from "./ChangeRoleView";
 
 function MemberInfoModal(props: {
-  isVisible: boolean;
+  projectName: string;
   username: string;
   onClose: () => void;
 }): JSX.Element {
   const [showRoles, setShowRoles] = useState(false);
-  if (!props.isVisible) return <></>;
 
   const handleChangeRole = (): void => {
     if (showRoles) {
@@ -24,51 +23,47 @@ function MemberInfoModal(props: {
       className="fixed inset-0 bg-black bg-opacity-30 backdrop-blur-sm 
       flex justify-center items-center"
     >
-      <div className="border-4 border-black bg-white p-2 rounded-lg text-center flex flex-col">
+      <div className="border-4 border-black bg-white rounded-lg text-center flex flex-col">
-        <p className="font-bold text-[30px]">{props.username}</p>
+        <div className="mx-10">
-        <p
+          <p className="font-bold text-[30px]">{props.username}</p>
-          className="mb-[20px] hover:font-bold hover:cursor-pointer underline"
+          <p
-          onClick={handleChangeRole}
+            className="hover:font-bold hover:cursor-pointer underline"
-        >
+            onClick={handleChangeRole}
-          (Change Role)
+          >
-        </p>
+            (Change Role)
-        {showRoles && (
+          </p>
-          <ChangeRoleView
+          {showRoles && (
-            projectName={localStorage.getItem("projectName") ?? ""}
+            <ChangeRoleView
-            username={props.username}
+              projectName={props.projectName}
-          />
+              username={props.username}
-        )}
+            />
-        <div>
+          )}
-          <h2 className="font-bold text-[22px] mb-[20px]">
+          <h2 className="font-bold text-[20px]">Member of these projects:</h2>
-            Member of these projects:
+          <UserProjectListAdmin username={props.username} />
-          </h2>
+          <div className="items-center space-x-6">
-          <div className="pr-6 pl-6">
+            <Button
-            <UserProjectListAdmin username={props.username} />
+              text={"Delete"}
+              onClick={function (): void {
+                if (
+                  window.confirm("Are you sure you want to delete this user?")
+                ) {
+                  DeleteUser({
+                    usernameToDelete: props.username,
+                  });
+                }
+              }}
+              type="button"
+            />
+            <Button
+              text={"Close"}
+              onClick={function (): void {
+                setShowRoles(false);
+                props.onClose();
+              }}
+              type="button"
+            />
           </div>
         </div>
-        <div className="items-center space-x-6 pr-6 pl-6">
-          <Button
-            text={"Delete"}
-            onClick={function (): void {
-              if (
-                window.confirm("Are you sure you want to delete this user?")
-              ) {
-                DeleteUser({
-                  usernameToDelete: props.username,
-                });
-              }
-            }}
-            type="button"
-          />
-          <Button
-            text={"Close"}
-            onClick={function (): void {
-              setShowRoles(false);
-              props.onClose();
-            }}
-            type="button"
-          />
-        </div>
       </div>
     </div>
   );

frontend/src/Components/ProjectListAdmin.tsx

@@ -18,7 +18,7 @@ export function ProjectListAdmin(props: {
   projects: NewProject[];
 }): JSX.Element {
   const [projectModalVisible, setProjectModalVisible] = useState(false);
-  const [projectname, setProjectname] = useState("");
+  const [projectName, setProjectName] = useState("");
   const [userModalVisible, setUserModalVisible] = useState(false);
   const [username, setUsername] = useState("");
 
@@ -28,34 +28,36 @@ export function ProjectListAdmin(props: {
   };
 
   const handleClickProject = (projectname: string): void => {
-    setProjectname(projectname);
+    setProjectName(projectname);
-    localStorage.setItem("projectName", projectname);
     setProjectModalVisible(true);
   };
 
   const handleCloseProject = (): void => {
-    setProjectname("");
+    setProjectName("");
     setProjectModalVisible(false);
   };
 
   const handleCloseUser = (): void => {
-    setProjectname("");
+    setUsername("");
     setUserModalVisible(false);
   };
 
   return (
     <>
-      <ProjectInfoModal
+      {projectModalVisible && (
-        onClose={handleCloseProject}
+        <ProjectInfoModal
-        onClick={handleClickUser}
+          onClose={handleCloseProject}
-        isVisible={projectModalVisible}
+          onClick={handleClickUser}
-        projectname={projectname}
+          projectname={projectName}
-      />
+        />
-      <MemberInfoModal
+      )}
-        onClose={handleCloseUser}
+      {userModalVisible && (
-        isVisible={userModalVisible}
+        <MemberInfoModal
-        username={username}
+          onClose={handleCloseUser}
-      />
+          username={username}
+          projectName={projectName}
+        />
+      )}
       <div>
         <ul className="font-bold underline text-[30px] cursor-pointer padding">
           {props.projects.map((project) => (

frontend/src/Components/Register.tsx

@@ -49,22 +49,24 @@ export default function Register(): JSX.Element {
           <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
             Register New User
           </h3>
-          <InputField
+          <div className="space-y-3">
-            label="Username"
+            <InputField
-            type="text"
+              label="Username"
-            value={username ?? ""}
+              type="text"
-            onChange={(e) => {
+              value={username ?? ""}
-              setUsername(e.target.value);
+              onChange={(e) => {
-            }}
+                setUsername(e.target.value);
-          />
+              }}
-          <InputField
+            />
-            label="Password"
+            <InputField
-            type="password"
+              label="Password"
-            value={password ?? ""}
+              type="password"
-            onChange={(e) => {
+              value={password ?? ""}
-              setPassword(e.target.value);
+              onChange={(e) => {
-            }}
+                setPassword(e.target.value);
-          />
+              }}
+            />
+          </div>
           <div className="flex items-center justify-between">
             <Button
               text="Register"

frontend/src/Components/UserInfoModal.tsx

@@ -38,65 +38,61 @@ function UserInfoModal(props: {
       className="fixed inset-0 bg-black bg-opacity-30 backdrop-blur-sm 
       flex justify-center items-center"
     >
-      <div className="border-4 border-black bg-white p-2 rounded-lg text-center flex flex-col">
+      <div className="border-4 border-black bg-white rounded-lg text-center flex flex-col">
-        <p className="font-bold text-[30px]">{props.username}</p>
+        <div className="mx-10">
-        <p
+          <p className="font-bold text-[30px]">{props.username}</p>
-          className="mb-[20px] hover:font-bold hover:cursor-pointer underline"
+          <p
-          onClick={handleChangeNameView}
+            className="mb-[10px] hover:font-bold hover:cursor-pointer underline"
-        >
+            onClick={handleChangeNameView}
-          (Change Username)
+          >
-        </p>
+            (Change Username)
-        {showInput && (
+          </p>
-          <div className="border-2 border-black rounded-lg p-2">
+          {showInput && (
-            <InputField
+            <div>
-              label={"New username"}
+              <InputField
-              type={"text"}
+                label={"New username"}
-              value={newUsername}
+                type={"text"}
-              onChange={function (e): void {
+                value={newUsername}
-                e.defaultPrevented;
+                onChange={function (e): void {
-                setNewUsername(e.target.value);
+                  e.defaultPrevented;
+                  setNewUsername(e.target.value);
+                }}
+              />
+              <Button
+                text={"Change"}
+                onClick={function (): void {
+                  handleClickChangeName();
+                }}
+                type={"submit"}
+              />
+            </div>
+          )}
+          <h2 className="font-bold text-[20px]">Member of these projects:</h2>
+          <UserProjectListAdmin username={props.username} />
+          <div className="items-center space-x-6">
+            <Button
+              text={"Delete"}
+              onClick={function (): void {
+                if (
+                  window.confirm("Are you sure you want to delete this user?")
+                ) {
+                  DeleteUser({
+                    usernameToDelete: props.username,
+                  });
+                }
               }}
+              type="button"
             />
             <Button
-              text={"Change"}
+              text={"Close"}
               onClick={function (): void {
-                handleClickChangeName();
+                setNewUsername("");
+                setShowInput(false);
+                props.onClose();
               }}
-              type={"submit"}
+              type="button"
             />
           </div>
-        )}
-        <div>
-          <h2 className="font-bold text-[22px] mb-[20px]">
-            Member of these projects:
-          </h2>
-          <div className="pr-6 pl-6">
-            <UserProjectListAdmin username={props.username} />
-          </div>
-        </div>
-        <div className="items-center space-x-6 pr-6 pl-6">
-          <Button
-            text={"Delete"}
-            onClick={function (): void {
-              if (
-                window.confirm("Are you sure you want to delete this user?")
-              ) {
-                DeleteUser({
-                  usernameToDelete: props.username,
-                });
-              }
-            }}
-            type="button"
-          />
-          <Button
-            text={"Close"}
-            onClick={function (): void {
-              setNewUsername("");
-              setShowInput(false);
-              props.onClose();
-            }}
-            type="button"
-          />
         </div>
       </div>
     </div>

frontend/src/Components/UserProjectListAdmin.tsx

@@ -8,10 +8,10 @@ function UserProjectListAdmin(props: { username: string }): JSX.Element {
   GetProjects({ setProjectsProp: setProjects, username: props.username });
 
   return (
-    <div className="border-2 border-black bg-white p-2 rounded-lg text-center">
+    <div className="border-2 border-black bg-white rounded-lg text-left overflow-auto h-[15vh] font-medium">
-      <ul>
+      <ul className="divide-y-2">
         {projects.map((project) => (
-          <li key={project.id}>
+          <li className="mx-2 my-1" key={project.id}>
             <span>{project.name}</span>
           </li>
         ))}

frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx

@@ -1,11 +1,11 @@
+import { useLocation } from "react-router-dom";
 import AddUserToProject from "../../Components/AddUserToProject";
 import BasicWindow from "../../Components/BasicWindow";
 
 function AdminProjectAddMember(): JSX.Element {
-  const content = <AddUserToProject />;
+  const projectName = useLocation().search.slice(1);
-
+  const content = <AddUserToProject projectName={projectName} />;
   const buttons = <></>;
-
   return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectAddMember;