From 88c6757bd3b982d7d168b455efb0d1ded0e0b64b Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sat, 13 Apr 2024 21:07:08 +0200
Subject: [PATCH] Checks if user already is selected role + minor design change

---
 frontend/src/Components/ChangeRoleView.tsx  | 55 +++++++++++----------
 frontend/src/Components/MemberInfoModal.tsx | 11 +++--
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/frontend/src/Components/ChangeRoleView.tsx b/frontend/src/Components/ChangeRoleView.tsx
index 782ad8d..9a69e34 100644
--- a/frontend/src/Components/ChangeRoleView.tsx
+++ b/frontend/src/Components/ChangeRoleView.tsx
@@ -5,6 +5,7 @@ import ChangeRole, { ProjectRoleChange } from "./ChangeRole";
 export default function ChangeRoleView(props: {
   projectName: string;
   username: string;
+  currentRole: string;
 }): JSX.Element {
   const [selectedRole, setSelectedRole] = useState<
     "project_manager" | "member" | ""
@@ -21,7 +22,12 @@ export default function ChangeRoleView(props: {
   };
 
   const handleSubmit = (event: React.FormEvent<HTMLFormElement>): void => {
+    console.log("Cur: " + props.currentRole + " " + "new: " + selectedRole);
     event.preventDefault();
+    if (selectedRole === props.currentRole) {
+      alert(`Already ${props.currentRole}, nothing changed`);
+      return;
+    }
     const roleChangeInfo: ProjectRoleChange = {
       username: props.username,
       projectname: props.projectName,
@@ -31,34 +37,31 @@ export default function ChangeRoleView(props: {
   };
 
   return (
-    <div className="overflow-auto rounded-lg">
+    <div className="overflow-auto">
       <h1 className="font-bold text-[20px]">Select role:</h1>
       <form onSubmit={handleSubmit}>
-        <div className="h-[7vh] self-start text-left font-medium overflow-auto border-2 border-black rounded-lg p-2">
-          <div className="hover:font-bold">
-            <label>
-              <input
-                type="radio"
-                value="project_manager"
-                checked={selectedRole === "project_manager"}
-                onChange={handleRoleChange}
-                className="ml-2 mr-2 mb-3"
-              />
-              Project manager
-            </label>
-          </div>
-          <div className="hover:font-bold">
-            <label>
-              <input
-                type="radio"
-                value="member"
-                checked={selectedRole === "member"}
-                onChange={handleRoleChange}
-                className="ml-2 mr-2"
-              />
-              Member
-            </label>
-          </div>
+        <div className="py-1 px-1 w-full self-start text-left font-medium overflow-auto border-2 border-black rounded-2xl">
+          <label className="hover:cursor-pointer hover:font-bold">
+            <input
+              type="radio"
+              value="project_manager"
+              checked={selectedRole === "project_manager"}
+              onChange={handleRoleChange}
+              className="m-2"
+            />
+            Project manager
+          </label>
+          <br />
+          <label className="hover:cursor-pointer hover:font-bold">
+            <input
+              type="radio"
+              value="member"
+              checked={selectedRole === "member"}
+              onChange={handleRoleChange}
+              className="m-2 hover:cursor-pointer"
+            />
+            Member
+          </label>
         </div>
         <Button
           text="Change"
diff --git a/frontend/src/Components/MemberInfoModal.tsx b/frontend/src/Components/MemberInfoModal.tsx
index 10fb5f7..1b9192e 100644
--- a/frontend/src/Components/MemberInfoModal.tsx
+++ b/frontend/src/Components/MemberInfoModal.tsx
@@ -1,12 +1,13 @@
 import Button from "./Button";
 import UserProjectListAdmin from "./UserProjectListAdmin";
 import { useState } from "react";
-import ChangeRoleView from "./ChangeRoleView";
 import RemoveUserFromProj from "./RemoveUserFromProj";
+import ChangeRoleInput from "./ChangeRoleView";
 
 function MemberInfoModal(props: {
   projectName: string;
   username: string;
+  role: string;
   onClose: () => void;
 }): JSX.Element {
   const [showRoles, setShowRoles] = useState(false);
@@ -20,22 +21,24 @@ function MemberInfoModal(props: {
   };
   return (
     <div
-      className="fixed inset-10 bg-opacity-30 backdrop-blur-sm 
+      className="fixed inset-0 bg-opacity-30 backdrop-blur-sm 
       flex justify-center items-center"
     >
       <div className="border-4 border-black bg-white rounded-2xl text-center flex flex-col">
         <div className="mx-10">
           <p className="font-bold text-[30px]">{props.username}</p>
+          <p className="font-bold text-[20px]">{props.role}</p>
           <p
-            className="hover:font-bold hover:cursor-pointer underline"
+            className="hover:font-bold hover:cursor-pointer underline mb-2 mt-1"
             onClick={handleChangeRole}
           >
             (Change Role)
           </p>
           {showRoles && (
-            <ChangeRoleView
+            <ChangeRoleInput
               projectName={props.projectName}
               username={props.username}
+              currentRole={props.role}
             />
           )}
           <h2 className="font-bold text-[20px]">Member of these projects:</h2>