Merge pull request #48 from SMUGitGeeks/SBRP-109-V2

Merge first so the rest of the other tasks can edit this version
SMUGitGeeks · Nov 3, 2023 · ee31a78 · ee31a78
2 parents f25d367 + 9c6c78d
commit ee31a78
Show file tree

Hide file tree

Showing 25 changed files with 1,459 additions and 1,706 deletions.
diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -15,7 +15,6 @@ import {getStaffSkillsByStaffId} from "./actions/staffSkills";
 import {getApplicationsByStaffId} from "./actions/applications";
 import Profile from './components/pages/Profile';
 import Restricted from "./components/pages/Restricted";
-import HR from "./components/pages/HR";
 import RoleApplicants from './components/pages/RoleApplicants';
 import StaffDetail from './components/pages/StaffDetail';
 import RoleListingManager from './components/pages/RoleListingManager';
@@ -61,8 +60,7 @@ const App = ({getStaffSkillsByStaffId, getApplicationsByStaffId, auth: {user, is
                                         <Route path="/roleListing" element={<RoleListing/>}/>
                                         <Route path="/roleListing/:rl_id" element={<RolePage/>}/>
                                         <Route path="/profile" element={<Profile/>}/>
-                                        <Route path="/hr" element={<HR/>}/>
-                                        <Route path="/role/:roleListingId/applicants" element={<RoleApplicants/>}/>
+                                        <Route path="/roleListing/:roleListingId/applicants" element={<RoleApplicants/>}/>
                                         <Route path="/staff/:staffId" element={<StaffDetail/>}/>
                                         <Route path="/listingManage" element={<RoleListingManager/>}/>
                                         <Route path="/listingManage/update/:rl_id" element={<UpdateRoleListing/>}/>
@@ -75,8 +73,7 @@ const App = ({getStaffSkillsByStaffId, getApplicationsByStaffId, auth: {user, is
                                         <Route path="/roleListing" element={<RoleListing/>}/>
                                         <Route path="/roleListing/:rl_id" element={<RolePage/>}/>
                                         <Route path="/profile" element={<Profile/>}/>
-                                        <Route path="/hr" element={<Restricted/>}/>
-                                        <Route path="/role/:roleListingId/applicants" element={<Restricted/>}/>
+                                        <Route path="/roleListing/:roleListingId/applicants" element={<Restricted/>}/>
                                         <Route path="/staff/:staffId" element={<Restricted/>}/>
                                         <Route path="/listingManage" element={<Restricted/>}/>
                                         <Route path="/listingManage/update/:rl_id" element={<Restricted/>}/>

diff --git a/client/src/components/layout/Favourites.tsx b/client/src/components/layout/Favourites.tsx
diff --git a/client/src/components/layout/HrRoleListings.test.tsx b/client/src/components/layout/HrRoleListings.test.tsx