Merge pull request #92 from YosephSE/final-fix

Final fix
YosephSE · Sep 17, 2024 · 865a17e · 865a17e
2 parents 3392fb6 + 2d9a704
commit 865a17e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 21 deletions.
diff --git a/client/app/LoginChecker.tsx b/client/app/LoginChecker.tsx
@@ -3,6 +3,7 @@ import React, { useEffect } from 'react'
 import { useAppDispatch } from '@/redux/Hooks'
 import { resetSuccess as resetUser, fetchuser as userLogin } from '@/redux/slices/UserSlice'
 import { fetchuser as adminLogin, resetSuccess as resetAdmin } from '@/redux/slices/AdminSlice'
+import { useRouter } from 'next/navigation'
 
 
 const LoginChecker = ({
@@ -11,9 +12,10 @@ const LoginChecker = ({
     children: React.ReactNode
   }) => {
     const dispatch = useAppDispatch()
+    const router = useRouter()
     useEffect(() => {
-      const userToken = sessionStorage.getItem('userToken');
-      const adminToken = sessionStorage.getItem('adminToken');
+      const userToken = localStorage.getItem('userToken');
+      const adminToken = localStorage.getItem('adminToken');
       const fetchUser = async()=>{
         if (userToken) {
             await dispatch(userLogin({ token: userToken })); 
@@ -22,6 +24,7 @@ const LoginChecker = ({
         if (adminToken) {
             await dispatch(adminLogin({ token: adminToken })); 
             dispatch(resetAdmin())
+            router.push('/admin/alljobs')
         }
       }
 

diff --git a/client/components/Header.tsx b/client/components/Header.tsx
@@ -51,6 +51,7 @@ const Header = ({ page }: Props) => {
         await dispatch(logout())
         dispatch(resetSuccess())
         handleMenuClose()
+        router.push('/')
     }
 
     return (

diff --git a/client/components/JobForm.tsx b/client/components/JobForm.tsx
@@ -23,17 +23,16 @@ interface Props {
 const JobForm = ({ page, id}: Props) => {
     const postStatus = useAppSelector((state: RootState) => state.jobs);
     const dispatch = useAppDispatch()
-    console.log(postStatus.currentJob)
     useEffect(() => {
         if(!id){
             dispatch(resetCurrentJob())
         }
-    })
+        dispatch(resetSuccess())
+    }, [])
 
     useEffect(() => {
         const fetchUser = async (_id: string) => {
             await dispatch(singlejob(_id))
-            console.log("requested")
             dispatch(resetSuccess())
         }
         if (id){

diff --git a/client/components/admin/JobsTable.tsx b/client/components/admin/JobsTable.tsx
@@ -24,6 +24,15 @@ export default function DataTable() {
   const [loading, setLoading] = useState<boolean>(true); // Add loading state
   const { resolvedTheme } = useTheme()
 
+  useEffect(() => {
+    const fetchJobs = async () => {
+      setLoading(true);
+      await dispatch(alljobs());
+    };
+    fetchJobs();
+  }, [dispatch]);
+
+  console.log(allJobs)
   useEffect(() => {
     if (allJobs) {
       setLocalJobs(
@@ -129,14 +138,6 @@ export default function DataTable() {
 
   const paginationModel = { page: 0, pageSize: 10 };
 
-  useEffect(() => {
-    const fetchJobs = async () => {
-      setLoading(true);
-      await dispatch(alljobs());
-    };
-    fetchJobs();
-  }, [dispatch]);
-
   return (
     <div className="h-auto w-full max-w-full overflow-x-auto">
       {loading ? (

diff --git a/client/redux/slices/AdminSlice.tsx b/client/redux/slices/AdminSlice.tsx
@@ -41,7 +41,7 @@ export const login = createAsyncThunk(
     async (user: LoginUserPayload, { rejectWithValue }) => {
         try {
             const response = await axios.post(`${api}/admins/login`, user);
-            sessionStorage.setItem('adminToken', response.data.token);
+            localStorage.setItem('adminToken', response.data.token);
             return response.data;
         } catch (error: any) {
             return rejectWithValue(error.response?.data?.error || error.response.data.message);
@@ -54,7 +54,7 @@ export const logout = createAsyncThunk(
     async (_, { rejectWithValue }) => {
         try {
             const response = await axios.post(`${api}/candidates/logout`);
-            sessionStorage.removeItem('adminToken')
+            localStorage.removeItem('adminToken')
             return response.data;
         } catch (error: any) {
             return rejectWithValue(error.response?.data?.error || error.response.data.message);

diff --git a/client/redux/slices/JobSlice.tsx b/client/redux/slices/JobSlice.tsx
@@ -101,7 +101,6 @@ const jobSlice = createSlice({
       .addCase(postjob.fulfilled, (state, action) => {
         state.isLoading = false;
         state.isSuccess = true;
-        state.allJobs?.push(action.payload);
       })
       .addCase(postjob.rejected, (state, action) => {
         state.isLoading = false;

diff --git a/client/redux/slices/UserSlice.tsx b/client/redux/slices/UserSlice.tsx
@@ -18,7 +18,7 @@ export const register = createAsyncThunk(
     async (user: RegisterUserPayload, { rejectWithValue }) => {
         try {
             const response = await axios.post(`${api}/candidates/register`, user);
-            sessionStorage.setItem('userToken', response.data.token);
+            localStorage.setItem('userToken', response.data.token);
             return response.data;
         } catch (error: any) {
             return rejectWithValue(error.response?.data?.error || error.response.data.message);
@@ -43,7 +43,7 @@ export const login = createAsyncThunk(
     async (user: LoginUserPayload, { rejectWithValue }) => {
         try {
             const response = await axios.post(`${api}/candidates/login`, user);
-            sessionStorage.setItem('userToken', response.data.token);
+            localStorage.setItem('userToken', response.data.token);
             return response.data;
         } catch (error: any) {
             return rejectWithValue(error.response?.data?.error || error.response.data.message);
@@ -56,7 +56,7 @@ export const logout = createAsyncThunk(
     async (_, { rejectWithValue }) => {
         try {
             const response = await axios.post(`${api}/candidates/logout`);
-            sessionStorage.removeItem('userToken')
+            localStorage.removeItem('userToken')
             return response.data;
         } catch (error: any) {
             return rejectWithValue(error.response?.data?.error || error.response.data.message);

diff --git a/server/src/controllers/jobs.controller.ts b/server/src/controllers/jobs.controller.ts
@@ -64,8 +64,8 @@ const createJob = asyncHandler(async (req: CustomRequest, res: Response) => {
   const newJob = new Job(req.body);
   const postedBy = req.user._id;
   newJob.postedBy = postedBy;
-  await newJob.save();
-  res.status(201).json({ message: "Job created successfully" });
+  const job = await newJob.save();
+  res.status(201).json(job);
 });
 
 const updateJob = asyncHandler(async (req: Request, res: Response) => {