Merge branch 'apiserver' into 'master'

activites slice made

See merge request !69

src/components/header/index.jsx

-import React, {useEffect, useState} from 'react';
-import {useNavigate, Link } from 'react-router-dom';
+import React, { useEffect, useState, useRef } from 'react';
+import { useNavigate, Link } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import clearStore from '../../utils/clearStore';
 
-function Header({isOpen}) {
+function Header({ isOpen }) {
     const dispatch = useDispatch();
     const navigate = useNavigate();
+    const logoutRef = useRef()
     const user = useSelector((state) => state.userDetails.user);
     const [open, setOpen] = useState(false)
 
@@ -13,25 +14,41 @@ function Header({isOpen}) {
         navigate('/');
         clearStore(dispatch)
     }
-    useEffect(()=>{
-        if(open!==false)
-        setOpen(isOpen)
+    useEffect(() => {
+        if (open !== false)
+            setOpen(isOpen)
 
-    },[isOpen])
+    }, [isOpen])
+
+
+    useEffect(() => {
+        // Function to disable the button when clicking anywhere on the document
+        const handleClickOutside = (event) => {
+            if (logoutRef.current && !logoutRef.current.contains(event.target)) {
+                setOpen(false);
+            }
+        };
+
+        document.addEventListener('click', handleClickOutside);
+
+        return () => {
+            document.removeEventListener('click', handleClickOutside);
+        };
+    }, []);
 
     return (
-        <div className="flex items-center justify-between py-5 px-10" onClick={() => setOpen(!open)}>
-            <Link to={"/dashboard"}><img src="/logo.png"/></Link>
+        <div className="flex items-center justify-between py-5 px-10" >
+            <Link to={"/dashboard"}><img src="/logo.png" /></Link>
             <div className="flex items-center relative">
-                <button className=" -mt-1 text-2xl flex" onClick={() => setOpen(!open)}>
+                <button ref={logoutRef} className=" -mt-1 text-2xl flex" onClick={() => setOpen(!open)}>
                     <img src="/user.png" width="35px" height="35px" className="mt-2 pr-2" />
                     <div className="flex flex-col">
                         <p className="text-lg font-semibold">{user?.empName}</p>
                         <p className="text-xs">{user?.designation}</p>
                     </div>
                 </button>
-                <button onClick={handleLogout} className={`${!open && "hidden"} absolute top-[40px] bg-white opacity-100 shadow-md px-5 py-1 bg-opacity-100 rounded border border-gray-400 right-0 hover:bg-blue-400 hover:text-white w-[-webkit-fill-available]`} style={{zIndex: 1}}>
-                        Logout
+                <button onClick={handleLogout} className={`${!open && "hidden"} absolute top-[40px] bg-white opacity-100 shadow-md px-5 py-1 bg-opacity-100 rounded border border-gray-400 right-0 hover:bg-blue-400 hover:text-white w-[-webkit-fill-available]`} style={{ zIndex: 1 }}>
+                    Logout
                 </button>
             </div>
         </div>

src/components/leftSidebar/index.jsx

@@ -43,7 +43,7 @@ function LeftSidebar() {
         Reportees
         </p>
         <input 
-          placeholder="Search Reportees"
+          placeholder="Search"
           type="text" 
           className="p-2 mi-2 border rounded w-[160px]"
           value={inputValue} 

src/components/modal/index.jsx

@@ -35,7 +35,7 @@ export default function MyModal({ visible, onClose, type, handleAddActivity }) {
 
 
   const handleScoreChange = (value) => {
-    setActivityData({ ...activityData, score: value })
+    setActivityData({ ...activityData, score: Number(value) })
   }
 
   const handlePerformance=(value)=> {

src/pages/dashboard/index.jsx

@@ -114,7 +114,7 @@ function Dashboard() {
       <div className="mb-2">
         <div className="flex justify-end my-1 mr-2 items-center">
           <label>Search Employee:</label>
-          <input placeholder="Enter value" value={inputValue} onChange={handleChange} type="text" className="p-1 px-2 border rounded ml-2"/>
+          <input placeholder="Enter" value={inputValue} onChange={handleChange} type="text" className="p-1 px-2 border rounded ml-2"/>
         </div>
          <Table headers={headers} data={reportees} loading={loading} maxHeight={88} />