Merge branch 'master' into ailys/G7T5-197

Author: deadline2359

app/src/components/job/JobTile.jsx

@@ -61,17 +61,15 @@ export default function JobTile({ jobId, jobName, jobDesc, skills, isActive, set
         </div>
         <div className='flex items-center mt-5 md:mt-0 justify-between'>
           <div className='flex-col'>
-            {skills.length >= 1 && (
+            {currentUserType === "STAFF" && skills.length >= 1 && (
               <CreateLearningJourneyButton handleCreateLJButtonClick={handleCreateLJButtonClick} />
             )}
-            <div className='flex'>
-              {currentUserType === "HR" && (
+            {currentUserType === "HR" && (
+              <div className='flex md:flex-col'>
                 <CreateEditJobButton handleEditJobButtonClick={handleEditJobButtonClick} />
-              )}
-              {currentUserType === "HR" && isActive ? (
-                <CreateDeleteJobButton showPopUp={showPopUp} />
-              ) : null}
-            </div>
+                {isActive ? <CreateDeleteJobButton showPopUp={showPopUp}/> : null}
+              </div>
+            )}
           </div>
           <JobTileButton isDetailsOpen={isDetailsOpen} setIsDetailsOpen={setIsDetailsOpen} />
           {currentUserType === "HR" && (
@@ -109,13 +107,13 @@ function CreateEditJobButton({ handleEditJobButtonClick }) {
 function CreateDeleteJobButton({ showPopUp }) {
   return (
     <button
-      type='button'
-      className='w-full flex items-center justify-center ml-auto text-white bg-secondary hover:bg-primary focus:ring-2 focus:ring-gray-300 rounded-lg text-sm px-5 py-2.5 text-center m-1'
-      onClick={showPopUp}
-    >
-      <TrashIcon className='mr-2 h-5 w-5' aria-hidden='true' />
-      <span>Deactivate</span>
-    </button>
+    type='button'
+    className='w-full flex items-center justify-center ml-auto text-white bg-accent2 hover:bg-accent3 focus:ring-2 focus:ring-gray-300 rounded-lg text-sm px-5 py-2.5 text-center m-1'
+    onClick={showPopUp}
+  >
+    <TrashIcon className='mr-2 h-5 w-5' aria-hidden='true' />
+    <span>Deactivate</span>
+  </button>
   );
 }
 

app/src/components/job/index.jsx

@@ -14,8 +14,9 @@ function Job() {
           <HRJob/>
         </>
       );
-    case "STAFF":
     case "MANAGER":
+      return <p>You are logged in as MANAGER so you see no Jobs</p>;
+    case "STAFF":
     default:
       // temporary addition for development, should not render anything without permission
       return (

app/src/components/skill/index.jsx

@@ -14,8 +14,9 @@ function Skill() {
           <HRSkill />
         </>
       );
-    case "STAFF":
     case "MANAGER":
+      return <p>You are logged in as MANAGER so you see no skills</p>;
+    case "STAFF":
     default:
       return (
         <>

app/src/layout/Navbar.jsx

@@ -6,9 +6,12 @@ import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/outline";
 import { PlusIcon } from "@heroicons/react/20/solid";
 import { toast } from "react-toastify";
 
+import { useUserContext } from "src/contexts/UserContext";
 import Login from "./Login";
 
 export default function Navbar() {
+  const { currentUserType } = useUserContext();
+
   const [pageNavigation, setPageNavigation] = useState([
     { name: "Learning Journeys", href: "/learning-journeys" },
     { name: "Skills", href: "/skills" },
@@ -39,7 +42,7 @@ export default function Navbar() {
         <>
           <div className='flex h-16 justify-between mx-auto max-w-7xl px-4 sm:px-6 lg:px-8'>
             <RoutingItems open={open} pageNavigation={pageNavigation} />
-            <CreateLJButton />
+            {currentUserType === "STAFF" && <CreateLJButton />}
             <LoginButton />
           </div>
           <Disclosure.Panel className='md:hidden'>