diff --git a/BACKEND/Modules/Admin/routes/api.php b/BACKEND/Modules/Admin/routes/api.php index dc662b2..771f5ee 100755 --- a/BACKEND/Modules/Admin/routes/api.php +++ b/BACKEND/Modules/Admin/routes/api.php @@ -149,8 +149,8 @@ Route::middleware('api') 'prefix' => 'category', ], function () { Route::get('/get-list-master', [CategoryController::class, 'getListMaster']); - Route::get('/work-days', [CategoryController::class, 'workDays']); - Route::put('/update-work-days', [CategoryController::class, 'updateWorkDays']); + Route::get('/work-days', [CategoryController::class, 'workDays'])->middleware('check.permission:admin.hr'); + Route::put('/update-work-days', [CategoryController::class, 'updateWorkDays'])->middleware('check.permission:admin.hr'); }); Route::group([ diff --git a/FRONTEND/src/components/Navbar/Navbar.tsx b/FRONTEND/src/components/Navbar/Navbar.tsx index 505da5d..7b15200 100755 --- a/FRONTEND/src/components/Navbar/Navbar.tsx +++ b/FRONTEND/src/components/Navbar/Navbar.tsx @@ -146,8 +146,8 @@ const data = [ link: '/organization-settings', label: 'Organization Settings', icon: IconSettings, - group: 'admin', - permissions: 'admin', + group: 'other', + permissions: 'admin,hr', }, { link: '/profiles', diff --git a/FRONTEND/src/pages/OrganizationSettings/OrganizationSettings.tsx b/FRONTEND/src/pages/OrganizationSettings/OrganizationSettings.tsx index fae84e4..5261531 100644 --- a/FRONTEND/src/pages/OrganizationSettings/OrganizationSettings.tsx +++ b/FRONTEND/src/pages/OrganizationSettings/OrganizationSettings.tsx @@ -36,6 +36,7 @@ import { DatePickerInput } from '@mantine/dates' import { IconInfoCircle } from '@tabler/icons-react' import dayjs from 'dayjs' import customParseFormat from 'dayjs/plugin/customParseFormat' +import { checkPermissionAdmin } from '@/rtk/localStorage' dayjs.extend(customParseFormat) @@ -55,21 +56,21 @@ function OrganizationSettings() { Work Day Setting - Technical Setting - Setting 3 + + {checkPermissionAdmin('admin') && ( + Technical Setting + )} - - - - - - Setting 3 - + {checkPermissionAdmin('admin') && ( + + + + )} diff --git a/FRONTEND/src/routes/main.tsx b/FRONTEND/src/routes/main.tsx index b40b3b2..296a392 100755 --- a/FRONTEND/src/routes/main.tsx +++ b/FRONTEND/src/routes/main.tsx @@ -239,7 +239,7 @@ const mainRoutes = [ { path: '/organization-settings', element: ( - +