resolved conflicts

atlp-rwanda · Oct 8, 2024 · ccad7df · ccad7df
1 parent ae48f11
commit ccad7df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -93,6 +93,7 @@
     "browser": "^0.2.6",
     "date-fns": "^2.29.3",
     "dayjs": "^1.11.6",
+    "debounce": "^2.1.1",
     "dotenv": "^16.0.3",
     "express": "^4.21.0",
     "flowbite": "^1.5.3",
@@ -122,8 +123,8 @@
     "react-icons": "^4.6.0",
     "react-js-pagination": "^3.0.3",
     "react-loader-spinner": "^6.1.6",
-    "react-modal": "^3.16.1",
     "react-loading-skeleton": "^3.5.0",
+    "react-modal": "^3.16.1",
     "react-paginate": "^8.1.3",
     "react-redux": "^8.0.4",
     "react-render-html": "^0.6.0",

diff --git a/src/pages/JobPost/job.tsx b/src/pages/JobPost/job.tsx
@@ -24,6 +24,8 @@ import { deleteJobPostAction } from "../../redux/actions/deleteJobPostAction";
 import { JobPostSkeleton } from "../../skeletons/jobPostSkeleton";
 import { getAllFilteredJobPosts } from '../../redux/actions/filterJobPost'
 import { getAllJobPosts } from '../../redux/actions/filterJobPost';
+import { debounce } from 'lodash';
+
 
 const Jobs = (props: any) => {
   const [addNewTraineeModel, setAddNewTraineeModel] = useState(false);
@@ -351,23 +353,7 @@ const Jobs = (props: any) => {
                   </button>
                 </div>
                 <Link to="/admin/filter_job_post">
-                  <button className="flex bg-primary dark:bg-[#56C870] rounded-md py-2 mt-2 px-4 text-white font-medium cursor-pointer">
-                    <icons.AiOutlineSearch className="mt-1 mr-1 font-bold" />{" "}
-                    Search
-                  </button>
-                </Link>
-              <div className="flex items-left px-8">
-                <div className="flex py-2 pb-8 w-fit">
-                  <button
-                    onClick={Open}
-                    className="flex bg-primary dark:bg-[#56C870] rounded-md py-2 px-4 text-white font-medium cursor-pointer"
-                  >
-                    <icons.AiOutlinePlus className="mt-1 mr-1 font-bold" /> Job
-                    Post
-                  </button>
-                </div>
-                <Link to="/admin/filter_job_post">
-                  <button className="flex bg-primary dark:bg-[#56C870] rounded-md py-2 mt-2 px-4 text-white font-medium cursor-pointer">
+                  <button className="flex bg-primary dark:bg-[#56C870] rounded-md py-2 mt-2 px-4 ml-4 text-white font-medium cursor-pointer">
                     <icons.AiOutlineSearch className="mt-1 mr-1 font-bold" />{" "}
                     Search
                   </button>
@@ -721,7 +707,6 @@ const Jobs = (props: any) => {
         </div>
       </div>
       </div>
-      </div>
       </>
   );
 };