resolved conflicts

.gitignore

@@ -8,4 +8,4 @@ package-lock.json
 yarn.lock
 .DS_Store
 build/
-yarn.lock
+yarn.lock

src/components/sidebar/sidebarItems.tsx

@@ -34,11 +34,6 @@ export const sidebarItems1 = [
     icon: <Icon icon="akar-icons:globe"></Icon>,
     title: "Applications",
   },
-  {
-    path: "Trainee-applicants",
-    icon: <Icon icon="ic:round-people"></Icon>,
-    title: "Trainees-Applicants",
-  },
   {
     path: "cohort",
     icon: <Icon icon="fa6-solid:graduation-cap"></Icon>,
@@ -49,11 +44,6 @@ export const sidebarItems1 = [
     icon: <Icon icon="game-icons:cycle"></Icon>,
     title: "Application Cycles",
   },
-  {
-    path: 'Trainee-applicants',
-    icon: <Icon icon="ic:round-people"></Icon>,
-    title: 'Trainees/Applicants',
-  },
 
   {
     path: "grading",

src/pages/Applications.tsx

@@ -1,9 +1,9 @@
-import React, { useEffect, useState } from 'react';
-import { ToastContainer } from 'react-toastify';
-import * as icons from 'react-icons/ai';
-import { Link } from 'react-router-dom';
-import Select from 'react-select';
-import * as AiIcons from 'react-icons/ai';
+import React, { useEffect, useState } from "react";
+import { ToastContainer } from "react-toastify";
+import * as icons from "react-icons/ai";
+import { Link, useNavigate } from "react-router-dom";
+import Select from "react-select";
+import * as AiIcons from "react-icons/ai";
 import {
   deleteApplication,
   getMyApplications,
@@ -24,17 +24,20 @@ interface Update {
 }
 const Applications = (props: any) => {
   const dispatch = useAppDispatch();
-  const { myApplications, currentApplication } = props;
+  const navigate = useNavigate();
 
-  const [moredrop, setmoredrop] = useState('');
-  const [filter, setFilter] = useState('submitted');
+  const { myApplications, currentApplication, loading } = props;
+  console.log("My Applications:", myApplications);
+
+  const [moredrop, setmoredrop] = useState("");
+  const [filter, setFilter] = useState("submitted");
   const [pagination, setPagination] = useState({
     pageSize: 5,
     page: 1,
   });
 
   const [deleteWarn, setDeleteWarn] = useState<Update>({
-    id: '',
+    id: "",
     open: false,
   });
 
@@ -50,7 +53,7 @@ const Applications = (props: any) => {
   };
   const handleMoreOptions = (item_id: any) => {
     if (!moredrop) setmoredrop(item_id);
-    if (moredrop) setmoredrop('');
+    if (moredrop) setmoredrop("");
   };
 
   const handleDeleteApplication = (item_id: any) => {
@@ -61,11 +64,20 @@ const Applications = (props: any) => {
     }
   };
   const handleDateOfSubmission = (dateString: any) => {
-    const datePart = dateString.slice(0, dateString.indexOf('T'));
+    const datePart = dateString.slice(0, dateString.indexOf("T"));
     return datePart;
   };
   useEffect(() => {
-    dispatch(getMyApplications(filter, pagination));
+    const result = dispatch(getMyApplications(filter, pagination));
+
+    if (
+      result.error === "Oops! You must be logged in to proceed" ||
+      result.error === "Session expired. Please login again to continue."
+    ) {
+      setTimeout(() => {
+        navigate("/login");
+      }, 5000);
+    }
   }, [filter, pagination, dispatch]);
 
   const isLoading = myApplications.loading;
@@ -84,8 +96,11 @@ const Applications = (props: any) => {
               <div className="bg-light-bg dark:bg-dark-frame-bg  min-h-screen overflow-y-hidden overflow-x-hidden">
                 <div className="flex items-left px-8 pt-1">
                   <Link to="/filter_trainee-applicants">
-                    <button className="flex bg-primary dark:bg-[#56C870] rounded-md py-2 mt-2 px-4 text-white font-medium cursor-pointer" disabled>
-                      <icons.AiOutlineSearch className="mt-1 mr-1 font-bold" />{' '}
+                    <button
+                      className="flex bg-primary dark:bg-[#56C870] rounded-md py-2 mt-2 px-4 text-white font-medium cursor-pointer"
+                      disabled
+                    >
+                      <icons.AiOutlineSearch className="mt-1 mr-1 font-bold" />{" "}
                       Search
                     </button>
                   </Link>
@@ -95,21 +110,21 @@ const Applications = (props: any) => {
                   <ul className=" flex dark:text-white semi-md:space-x-5 p-5  text-sm  lg:px-8 semi-md:flex-row sm:flex-col ">
                     <li
                       className={`${
-                        filter === 'submitted'
-                          ? 'underline underline-offset-8 decoration-green'
-                          : ''
+                        filter === "submitted"
+                          ? "underline underline-offset-8 decoration-green"
+                          : ""
                       } cursor-pointer`}
-                      onClick={() => setFilter('submitted')}
+                      onClick={() => setFilter("submitted")}
                     >
                       Submitted
                     </li>
                     <li
                       className={`${
-                        filter === 'withdrawn'
-                          ? 'underline underline-offset-8 decoration-green'
-                          : ''
+                        filter === "withdrawn"
+                          ? "underline underline-offset-8 decoration-green"
+                          : ""
                       } cursor-pointer`}
-                      onClick={() => setFilter('withdrawn')}
+                      onClick={() => setFilter("withdrawn")}
                     >
                       Withdrawn
                     </li>
@@ -406,7 +421,7 @@ const Applications = (props: any) => {
                                             ?.dateOfSubmission !== undefined
                                             ? handleDateOfSubmission(
                                               currentApplication.data
-                                                ?.dateOfSubmission,
+                                                ?.dateOfSubmission
                                             )
                                             : null}
                                         </p>
@@ -548,6 +563,7 @@ const Applications = (props: any) => {
 const mapState = (state: any) => ({
   myApplications: state.myApplications,
   currentApplication: state.currentApplication,
+  loading: state.myApplications.loading,
 });
 
 export default connect(mapState, {

src/pages/Applications/AdminViewApplications.tsx

@@ -1,37 +1,44 @@
 import React, { useState, useEffect } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+import NavBar from '../../components/sidebar/navHeader';
 import { fetchApplications } from '../../redux/actions/adminListApplications';
 import { Pagination } from 'flowbite-react';
 import { ApplicationsSkeleton } from '../../skeletons/applicationsSkeleton';
 import ApplicationsTable from './ApplicationsTable';
 const ListApplications = () => {
   const [applications, setApplications] = useState([]);
+  const navigate = useNavigate();
+
   const [activePage, setActivePage] = useState(1);
   const [itemsCountPerPage, setItemsCountPerPage] = useState(10);
   const [loading, setLoading] = useState(false);
   const [isDrop, setDrop] = useState("");
   useEffect(() => {
- const fetchData = async () => {
-      setLoading(true);
-      try {
-        const data = await fetchApplications();
-        if (data?.applications) {
-          const slicedData = data.applications.slice(
-            (activePage - 1) * itemsCountPerPage,
-            activePage * itemsCountPerPage
-          );
-          setApplications(slicedData);
-        } else {
-          setApplications([]); 
-        }
-      } catch (error) {
-        console.error('Error fetching applications', error);
+  const fetchData = async () => {
+    setLoading(true);
+    try {
+      const { data, error } = await fetchApplications();
+
+      if (error) {
         setApplications([]); 
-      } finally {
-        setLoading(false);
+      } else if (data?.applications) {
+        const slicedData = data.applications.slice(
+          (activePage - 1) * itemsCountPerPage,
+          activePage * itemsCountPerPage
+        );
+        setApplications(slicedData);
       }
-    };
-    fetchData();
-  }, [activePage, itemsCountPerPage]);
+    } catch (error) {
+      console.error('Error fetching applications', error);
+      setApplications([]);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  fetchData();
+}, [activePage, itemsCountPerPage]);
+
   const handlePageChange = (pageNumber) => setActivePage(pageNumber);
   const handleItemsCountPerPageChange = (event) => {
     setItemsCountPerPage(Number(event.target.value));

src/pages/JobPost/jobTypes.ts

@@ -0,0 +1,55 @@
+export interface Program {
+    _id: string;
+    title: string;
+  }
+
+  export interface Cycle {
+    id: string;
+    name: string;
+  }
+
+  export interface Cohort {
+    id: string;
+    title: string;
+  }
+
+  export interface JobPost {
+    _id: string;
+    title: string;
+    program: Program;
+    cycle: Cycle;
+    cohort: Cohort;
+    description: string;
+    published: boolean;
+  }
+
+  export interface FormData {
+    title: string;
+    program: string;  // Stores program title
+    cycle: string;    // Stores cycle name
+    cohort: string;   // Stores cohort title
+    description: string;
+    published: boolean;
+  }
+
+  export interface RootState {
+    fetchSingleJobPost: {
+      data: JobPost | null;
+      loading: boolean;
+      serverResponded: boolean;
+    };
+    updateProgram: {
+      loading: boolean;
+      error: string | null;
+    };
+    programs: {
+      data: Program[];
+    };
+    cycles: {
+      data: Cycle[];
+    };
+    cohorts: {
+      data: Cohort[];
+    };
+  }
+