phx-uikit 1.0.70 → 1.0.72

package/dist/cjs/components/MainWrapV3/MainWrapV3.js

@@ -18,12 +18,17 @@ var Banner_1 = require("../Banner");
 var solid_2 = require("@heroicons/react/24/solid");
 var getLoginInfo_1 = tslib_1.__importDefault(require("../Func/getLoginInfo"));
 var clientQueryV3_1 = tslib_1.__importDefault(require("../Func/clientQueryV3"));
-var sub_menu_style_1 = require("../MainWrap/style/sub-menu-style");
-var nav_mobile_1 = tslib_1.__importDefault(require("../MainWrap/navigator/nav-mobile"));
-var appearance_styled_1 = tslib_1.__importDefault(require("../MainWrap/appearance/appearance-styled"));
 var query_1 = require("../../query");
 var Card_1 = require("../Card");
 var getEnvPublic_1 = tslib_1.__importDefault(require("../Func/getEnvPublic"));
+var saveCookiesClient_1 = tslib_1.__importDefault(require("../Func/saveCookiesClient"));
+var getActionPermission_1 = require("../Func/getActionPermission");
+var LoadingProvider_1 = require("../LoadingProvider");
+var appearance_styled_1 = tslib_1.__importDefault(require("./appearance/appearance-styled"));
+var nav_mobile_1 = tslib_1.__importDefault(require("./navigator/nav-mobile"));
+var sub_menu_style_1 = require("./style/sub-menu-style");
+var Icon_1 = require("./assets/Icon");
+var image_1 = tslib_1.__importDefault(require("next/image"));
 fontawesome_svg_core_1.library.add(free_solid_svg_icons_1.fas);
 function classNames() {
     var classes = [];
@@ -34,7 +39,7 @@ function classNames() {
 }
 var PHXMainWrapV3 = function (_a) {
     var _b, _c, _d, _e;
-    var children = _a.children, params = _a.params, pathName = _a.pathName, router = _a.router, _f = _a.hiddenLeftMenu, hiddenLeftMenu = _f === void 0 ? false : _f, _g = _a.logoHeight, logoHeight = _g === void 0 ? '28px' : _g, getDataCookies = _a.getDataCookies, _h = _a.multipleMenu, multipleMenu = _h === void 0 ? false : _h;
+    var children = _a.children, getDataCookies = _a.getDataCookies, _f = _a.hiddenLeftMenu, hiddenLeftMenu = _f === void 0 ? false : _f, _g = _a.logoHeight, logoHeight = _g === void 0 ? '28px' : _g, _h = _a.multipleMenu, multipleMenu = _h === void 0 ? false : _h, params = _a.params, pathName = _a.pathName, router = _a.router;
     var pid = (params ? params : {}).pid;
     var _j = (0, react_2.useState)(false), modal = _j[0], setModal = _j[1];
     var _k = (0, react_2.useState)(true), openSubMenu = _k[0], setOpenSubMenu = _k[1];
@@ -58,9 +63,7 @@ var PHXMainWrapV3 = function (_a) {
     var locationPathname = typeof window !== 'undefined' ? window.location.pathname : '';
     var pathArr = locationPathname.split('/');
     var pathNameWithBasePath = "/".concat(pathArr[1]).concat(pathName);
-    function checkRole(role, arr) {
-        return arr === null || arr === void 0 ? void 0 : arr.some(function (item) { return (item === null || item === void 0 ? void 0 : item.toLowerCase()) === (role === null || role === void 0 ? void 0 : role.toLowerCase()); });
-    }
+    var setGlobalLoading = (0, LoadingProvider_1.useLoading)().setLoading;
     function enablePer(code, arr) {
         if (!code)
             return true;
@@ -70,7 +73,7 @@ var PHXMainWrapV3 = function (_a) {
         path: '',
         height: logoHeight
     }), logo = _3[0], setLogo = _3[1];
-    var cookie = js_cookie_1["default"].get(constants_1.isLoggedCookie);
+    var cookie = typeof window !== 'undefined' ? localStorage.getItem(constants_1.isLoggedCookie) : null;
     var authen = js_cookie_1["default"].get(constants_1.AUTH_TOKEN);
     function compareObjects(settingQuery, settingCookies) {
         var keysSettingQuery = Object.keys(settingQuery);
@@ -141,6 +144,7 @@ var PHXMainWrapV3 = function (_a) {
                         Object.keys(js_cookie_1["default"].get()).forEach(function (cookieName) {
                             js_cookie_1["default"].remove(cookieName);
                         });
+                        localStorage.removeItem(constants_1.isLoggedCookie);
                     }
                     return [3 /*break*/, 3];
                 case 2:
@@ -153,6 +157,7 @@ var PHXMainWrapV3 = function (_a) {
     }); };
     (0, react_2.useEffect)(function () {
         getProfileData();
+        js_cookie_1["default"].remove(constants_1.isLoggedCookie);
     }, []);
     (0, react_2.useEffect)(function () {
         var _a;
@@ -163,7 +168,7 @@ var PHXMainWrapV3 = function (_a) {
         else {
             var data = JSON.parse(cookie);
             var allRoleCodes = (_a = data === null || data === void 0 ? void 0 : data.user_roles) === null || _a === void 0 ? void 0 : _a.map(function (userRole) { var _a; return (_a = userRole === null || userRole === void 0 ? void 0 : userRole.role) === null || _a === void 0 ? void 0 : _a.role_code; });
-            var _b = data.school, group_id_1 = _b.school_name.group_id, school_name_id_1 = _b.school_name_id, school_id_1 = data.school_id, id_1 = data.id;
+            var id_1 = data.id, _b = data.school, group_id_1 = _b.school_name.group_id, school_name_id_1 = _b.school_name_id, school_id_1 = data.school_id;
             setRoleCode(allRoleCodes);
             setSchoolId(data === null || data === void 0 ? void 0 : data.school_id);
             var fetchData = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
@@ -227,34 +232,39 @@ var PHXMainWrapV3 = function (_a) {
             var allRoleCodesLength = allRoleCodes === null || allRoleCodes === void 0 ? void 0 : allRoleCodes.length;
             if (allRoleCodes && allRoleCodesLength > 0) {
                 var fetchDataPer = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-                    var res, userPermission, rolePermission, dataCodePermissionRole, dataCodePermissionUser, allCodes, uniqueValues, error_3;
-                    var _a, _b;
-                    return tslib_1.__generator(this, function (_c) {
-                        switch (_c.label) {
+                    var res, userPermission, rolePermission, dataPermissionUser, permissionRouter, permissionAction, objPermissionAction, encryptedData, uniqueValues, error_3;
+                    var _a, _b, _c, _d;
+                    return tslib_1.__generator(this, function (_e) {
+                        switch (_e.label) {
                             case 0:
-                                _c.trys.push([0, 2, 3, 4]);
+                                _e.trys.push([0, 3, 4, 5]);
                                 return [4 /*yield*/, (0, clientQueryV3_1["default"])({
                                         query: query_1.GET_PERMISSION_DETAIL_USER_V3,
                                         variables: { id: id_1, school_id: school_id_1 }
                                     })];
                             case 1:
-                                res = _c.sent();
+                                res = _e.sent();
                                 userPermission = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.permission_user;
                                 rolePermission = (_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.permission_role;
-                                dataCodePermissionRole = rolePermission === null || rolePermission === void 0 ? void 0 : rolePermission.map(function (item) { var _a; return (_a = item === null || item === void 0 ? void 0 : item.permission) === null || _a === void 0 ? void 0 : _a.code; });
-                                dataCodePermissionUser = userPermission === null || userPermission === void 0 ? void 0 : userPermission.map(function (item) { var _a; return (_a = item === null || item === void 0 ? void 0 : item.permission) === null || _a === void 0 ? void 0 : _a.code; });
-                                allCodes = tslib_1.__spreadArray(tslib_1.__spreadArray([], dataCodePermissionRole, true), dataCodePermissionUser, true);
-                                uniqueValues = Array.from(new Set(allCodes));
-                                setPerCode(uniqueValues);
-                                return [3 /*break*/, 4];
+                                dataPermissionUser = tslib_1.__spreadArray(tslib_1.__spreadArray([], userPermission, true), rolePermission, true);
+                                permissionRouter = (_c = dataPermissionUser === null || dataPermissionUser === void 0 ? void 0 : dataPermissionUser.filter(function (value) { var _a; return !((_a = value === null || value === void 0 ? void 0 : value.permission) === null || _a === void 0 ? void 0 : _a.is_action); })) === null || _c === void 0 ? void 0 : _c.map(function (item) { var _a; return (_a = item === null || item === void 0 ? void 0 : item.permission) === null || _a === void 0 ? void 0 : _a.code; });
+                                permissionAction = (_d = dataPermissionUser === null || dataPermissionUser === void 0 ? void 0 : dataPermissionUser.filter(function (value) { var _a; return (_a = value === null || value === void 0 ? void 0 : value.permission) === null || _a === void 0 ? void 0 : _a.is_action; })) === null || _d === void 0 ? void 0 : _d.map(function (item) { var _a; return (_a = item === null || item === void 0 ? void 0 : item.permission) === null || _a === void 0 ? void 0 : _a.code; });
+                                objPermissionAction = Object.fromEntries(permissionAction.map(function (key) { return [key, true]; }));
+                                encryptedData = (0, getActionPermission_1.encryptDataSync)(objPermissionAction);
+                                return [4 /*yield*/, (0, saveCookiesClient_1["default"])(constants_1.ACTION_PERMISSION, JSON.stringify(encryptedData), true)];
                             case 2:
-                                error_3 = _c.sent();
-                                console.error('Error fetching school data:', error_3);
-                                return [3 /*break*/, 4];
+                                _e.sent();
+                                uniqueValues = Array.from(new Set(permissionRouter));
+                                setPerCode(uniqueValues);
+                                return [3 /*break*/, 5];
                             case 3:
+                                error_3 = _e.sent();
+                                console.error('Error fetching school data:', error_3);
+                                return [3 /*break*/, 5];
+                            case 4:
                                 setIsLoadingPermission(false);
                                 return [7 /*endfinally*/];
-                            case 4: return [2 /*return*/];
+                            case 5: return [2 /*return*/];
                         }
                     });
                 }); };
@@ -272,8 +282,8 @@ var PHXMainWrapV3 = function (_a) {
                         case 0: return [4 /*yield*/, (0, getEnvPublic_1["default"])()];
                         case 1:
                             envPublic = _a.sent();
-                            menuUrl = envPublic === null || envPublic === void 0 ? void 0 : envPublic['SCHOOL_MENU'];
-                            logoMenuTop = envPublic === null || envPublic === void 0 ? void 0 : envPublic['SCHOOL_TOP_MENU_LOGO'];
+                            menuUrl = envPublic === null || envPublic === void 0 ? void 0 : envPublic.SCHOOL_MENU;
+                            logoMenuTop = envPublic === null || envPublic === void 0 ? void 0 : envPublic.SCHOOL_TOP_MENU_LOGO;
                             if (!menuUrl || !logoMenuTop) {
                                 console.error('menu or logo not found');
                             }
@@ -392,8 +402,9 @@ var PHXMainWrapV3 = function (_a) {
                         for (var k = 0; k < childItemLength; k++) {
                             var subChild = childItem.child[k];
                             subChild.current = isBelongParent(subChild.path, path);
-                            if (isBelongParent(subChild.path, path) || isBelongParent(childItem.path, path))
+                            if (isBelongParent(subChild.path, path) || isBelongParent(childItem.path, path)) {
                                 childItem.showChild = true;
+                            }
                             subChild.path === childItem.path ? (childItem.current = false) : null;
                         }
                     }
@@ -487,6 +498,7 @@ var PHXMainWrapV3 = function (_a) {
         var queryString = window.location.search;
         var urlParams = new URLSearchParams(queryString);
         var campaign = Number(urlParams.get('campaignId'));
+        setGlobalLoading(true);
         // handle for admissions
         if (campaign) {
             router.push("".concat(item.path, "?campaignId=").concat(campaign));
@@ -495,7 +507,7 @@ var PHXMainWrapV3 = function (_a) {
             router.push(item.path);
         }
     };
-    var path = logo.path, height = logo.height;
+    var height = logo.height, path = logo.path;
     var handleModalSignOut = function () { return setModalSignOut(true); };
     var handleRedirectRouter = function (path) {
         var currentURL = window.location.href;
@@ -508,6 +520,7 @@ var PHXMainWrapV3 = function (_a) {
         Object.keys(js_cookie_1["default"].get()).forEach(function (cookieName) {
             js_cookie_1["default"].remove(cookieName);
         });
+        localStorage.removeItem(constants_1.isLoggedCookie);
         console.log('Đăng xuất tài khoản');
         handleRedirectRouter('login-sso');
     };
@@ -518,9 +531,6 @@ var PHXMainWrapV3 = function (_a) {
         router.push('/campaign/list');
         loadParentNavigation('/admissions/campaign/list');
     };
-    var handleClickPageAdmin = function () {
-        window.location.replace('/permission/role/list');
-    };
     var checkChildBefore = function (item, currentItem) {
         var currentIndexActive = item.find(function (s) { return s.current; });
         return currentIndexActive ? currentIndexActive.id > currentItem.id : false;
@@ -540,8 +550,8 @@ var PHXMainWrapV3 = function (_a) {
                     var newSchoolId = selected;
                     if (newSchoolId && newSchoolId !== data.school_id) {
                         data.school_id = newSchoolId;
-                        var updatedCookie = encodeURIComponent(JSON.stringify(data));
-                        document.cookie = "".concat(constants_1.isLoggedCookie, "=").concat(updatedCookie, ";path=/");
+                        var updatedCookie = JSON.stringify(data);
+                        localStorage.setItem(constants_1.isLoggedCookie, updatedCookie);
                         window.location.replace('/');
                     }
                 }
@@ -584,34 +594,28 @@ var PHXMainWrapV3 = function (_a) {
     var checkLogoHeader = settingLength === 0 ? df_logo_dashboard : logo_dashboard || path;
     return (react_2["default"].createElement(react_2["default"].Fragment, null,
         react_2["default"].createElement("div", { className: 'flex min-h-full flex-col' },
-            react_2["default"].createElement(appearance_styled_1["default"], { defaultSettingLayout: defaultSettingLayout, data: dataSchool, configLayout: configLayout, settingLocal: getDataCookies }),
-            react_2["default"].createElement("header", { className: 'fixed top-0 z-50 min-w-full border-gray-200 bg-white header-color-styled' },
-                react_2["default"].createElement("div", { className: 'mx-auto flex h-14 items-center justify-between pr-4 bg-[#1a1a1a] header-styled' },
-                    react_2["default"].createElement("div", { className: 'flex items-center lg:w-32 gap-x-3' },
-                        react_2["default"].createElement("a", { href: '/', className: 'w-full flex items-center' }, path ? (react_2["default"].createElement(react_2["default"].Fragment, null, isLoading ? (react_2["default"].createElement("div", { className: 'animate-pulse w-full h-8 ml-3 header-loading-logo' })) : (react_2["default"].createElement("img", { alt: 'Logo', className: 'w-auto ml-3', src: checkLogoHeader, style: { height: height } })))) : (react_2["default"].createElement(react_2["default"].Fragment, null))),
-                        react_2["default"].createElement("div", { className: 'lg:hidden flex items-center' },
-                            react_2["default"].createElement("button", { className: 'bg-grey-100 mr-3 inline-flex p-1 items-center justify-center rounded-md text-gray-600 hover:bg-white focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white', onClick: function () { return setSidebarOpen(true); }, type: 'button' },
+            react_2["default"].createElement(appearance_styled_1["default"], { configLayout: configLayout, data: dataSchool, defaultSettingLayout: defaultSettingLayout, settingLocal: getDataCookies }),
+            react_2["default"].createElement("header", { className: 'header-color-styled fixed top-0 z-50 min-w-full border-gray-200 bg-white' },
+                react_2["default"].createElement("div", { className: 'header-styled mx-auto flex h-14 items-center justify-between bg-[#1a1a1a] pr-4' },
+                    react_2["default"].createElement("div", { className: 'flex items-center gap-x-3 lg:w-32' },
+                        react_2["default"].createElement("a", { className: 'flex w-full items-center', href: '/' }, path ? (react_2["default"].createElement(react_2["default"].Fragment, null, isLoading ? (react_2["default"].createElement("div", { className: 'header-loading-logo ml-3 h-8 w-full animate-pulse' })) : (react_2["default"].createElement("img", { alt: 'Logo', className: 'ml-3 w-auto', src: checkLogoHeader, style: { height: height } })))) : (react_2["default"].createElement(react_2["default"].Fragment, null))),
+                        react_2["default"].createElement("div", { className: 'flex items-center lg:hidden' },
+                            react_2["default"].createElement("button", { className: 'bg-grey-100 mr-3 inline-flex items-center justify-center rounded-md p-1 text-gray-600 hover:bg-white focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white', onClick: function () { return setSidebarOpen(true); }, type: 'button' },
                                 react_2["default"].createElement("span", { className: 'sr-only' }, "Open sidebar"),
                                 react_2["default"].createElement(outline_1.Bars3Icon, { "aria-hidden": 'true', className: 'h-6 w-6' })))),
-                    react_2["default"].createElement("div", { "aria-hidden": true, className: 'hidden sm:block w-[30%] h-8 bg-indigo-700 rounded-lg border border-indigo-500 relative hover:border-gray-200 cursor-pointer search-box-styled', onClick: function () { return setShowSearchBar(true); } },
-                        react_2["default"].createElement("div", { className: 'relative text-indigo-400 flex items-center gap-x-3 text-xs top-1.5 left-2.5' },
-                            react_2["default"].createElement("div", { className: 'flex items-center' },
-                                react_2["default"].createElement("svg", { xmlns: 'http://www.w3.org/2000/svg', fill: 'none', viewBox: '0 0 24 24', strokeWidth: '1.5', stroke: 'currentColor', className: 'w-4 h-4' },
-                                    react_2["default"].createElement("path", { strokeLinecap: 'round', strokeLinejoin: 'round', d: 'M21 21l-5.197-5.197m0 0A7.5 7.5 0 105.196 5.196a7.5 7.5 0 0010.607 10.607z' })),
-                                react_2["default"].createElement("p", { className: 'ml-2' }, "T\u00ECm ki\u1EBFm")))),
-                    react_2["default"].createElement(search_bar_1["default"], { open: showSearchBar, onClose: function () { return setShowSearchBar(false); } }),
+                    react_2["default"].createElement(search_bar_1["default"], { onClose: function () { return setShowSearchBar(false); }, open: showSearchBar }),
                     react_2["default"].createElement("div", { className: 'flex items-center gap-x-8' },
                         react_2["default"].createElement("div", { className: '-m-1.5 p-1.5' },
                             react_2["default"].createElement(react_1.Menu, { as: 'div', className: 'relative ml-3' },
                                 react_2["default"].createElement("div", null,
                                     react_2["default"].createElement(react_1.Menu.Button, { className: 'flex max-w-xs items-center rounded-full bg-gray-800 text-sm focus:outline-none focus:ring-2 focus:ring-white focus:ring-offset-2 focus:ring-offset-gray-800' },
                                         react_2["default"].createElement("span", { className: 'sr-only' }, "Open user menu"),
-                                        isLoading ? (react_2["default"].createElement("div", { className: 'animate-pulse flex' },
-                                            react_2["default"].createElement("div", { className: 'rounded-full h-8 w-8 header-loading-avatar' }))) : (react_2["default"].createElement("img", { alt: '', className: 'h-8 w-8 rounded-full', src: sourceAvatar })))),
+                                        isLoading ? (react_2["default"].createElement("div", { className: 'flex animate-pulse' },
+                                            react_2["default"].createElement("div", { className: 'header-loading-avatar h-8 w-8 rounded-full' }))) : (react_2["default"].createElement("img", { alt: '', className: 'h-8 w-8 rounded-full', src: sourceAvatar })))),
                                 react_2["default"].createElement(react_1.Transition, { as: react_2.Fragment, enter: 'transition ease-out duration-100', enterFrom: 'transform opacity-0 scale-95', enterTo: 'transform opacity-100 scale-100', leave: 'transition ease-in duration-75', leaveFrom: 'transform opacity-100 scale-100', leaveTo: 'transform opacity-0 scale-95' },
-                                    react_2["default"].createElement(react_1.Menu.Items, { className: ' px-2 absolute right-0 z-10 mt-2 w-[340px] origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none' },
+                                    react_2["default"].createElement(react_1.Menu.Items, { className: ' absolute right-0 z-10 mt-2 w-[340px] origin-top-right rounded-md bg-white px-2 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none' },
                                         react_2["default"].createElement(react_1.Menu.Item, null,
-                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'px-2 pt-4 pb-2 font-semibold text-gray-900 text-sm ' }, "Ch\u1ECDn tr\u01B0\u1EDDng")),
+                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'px-2 pb-2 pt-4 text-sm font-semibold text-gray-900 ' }, "Ch\u1ECDn tr\u01B0\u1EDDng")),
                                         !loadingSchool ? (react_2["default"].createElement(react_2["default"].Fragment, null, infoSchool
                                             .filter(function (val) {
                                             if (!enablePer(constants_1.switchSchool, perCode)) {
@@ -625,30 +629,28 @@ var PHXMainWrapV3 = function (_a) {
                                             react_2["default"].createElement("div", { "aria-hidden": true, className: "".concat(item.id === schoolId &&
                                                     infoSchool.length > 1 &&
                                                     !enablePer(constants_1.switchSchool, perCode) === false
-                                                    ? 'rounded-lg bg-zinc-200 text-gray-900 font-semibold '
+                                                    ? 'rounded-lg bg-zinc-200 font-semibold text-gray-900 '
                                                     : 'font-normal   ', " \n                                  ").concat(item.id !== schoolId &&
                                                     (infoSchool.length === 1 || !enablePer(constants_1.switchSchool, perCode)) === false
-                                                    ? 'hover:bg-gray-100 hover:rounded-lg cursor-pointer'
-                                                    : '', "\n                              py-1.5 relative  px-2 mb-1 text-gray-900 text-sm  flex justify-between items-center"), onClick: function () { return handleOpenModal(item.id); } },
-                                                react_2["default"].createElement("p", { className: 'truncate max-w-[95%]' }, item.name),
+                                                    ? 'cursor-pointer hover:rounded-lg hover:bg-gray-100'
+                                                    : '', "\n                              relative mb-1  flex items-center justify-between px-2  py-1.5 text-sm text-gray-900"), onClick: function () { return handleOpenModal(item.id); } },
+                                                react_2["default"].createElement("p", { className: 'max-w-[95%] truncate' }, item.name),
                                                 item.id === schoolId &&
                                                     infoSchool.length > 1 &&
-                                                    !enablePer(constants_1.switchSchool, perCode) === false && (react_2["default"].createElement(solid_2.CheckIcon, { "aria-hidden": 'true', className: 'h-4 w-4' }))))); }))) : (react_2["default"].createElement(Skeleton_1.PHXSkeleton, { className: 'flex-1 py-2 px-2', type: 'single' })),
+                                                    !enablePer(constants_1.switchSchool, perCode) === false && (react_2["default"].createElement(solid_2.CheckIcon, { "aria-hidden": 'true', className: 'h-4 w-4' }))))); }))) : (react_2["default"].createElement(Skeleton_1.PHXSkeleton, { className: 'flex-1 px-2 py-2', type: 'single' })),
                                         react_2["default"].createElement("div", { className: 'border-b pt-1.5' }),
                                         react_2["default"].createElement(react_1.Menu.Item, null,
-                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'pt-4 px-2 pb-2  font-semibold text-gray-900 text-sm' }, "T\u00F9y ch\u1ECDn")),
+                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'px-2 pb-2 pt-4  text-sm font-semibold text-gray-900' }, "T\u00F9y ch\u1ECDn")),
                                         react_2["default"].createElement(react_1.Menu.Item, null,
-                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'py-1.5 px-2 cursor-pointer text-gray-900 text-sm hover:bg-gray-100 hover:rounded-lg', onClick: handleProfilePage }, "Th\u00F4ng tin c\u00E1 nh\u00E2n")),
-                                        (checkRole(constants_1.admin, roleCode) || checkRole(constants_1.superAdmin, roleCode)) && (react_2["default"].createElement(react_1.Menu.Item, null,
-                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'py-1.5  px-2 cursor-pointer  text-gray-900 text-sm hover:bg-gray-100 hover:rounded-lg', onClick: handleClickPageAdmin }, "Qu\u1EA3n tr\u1ECB \u0111\u0103ng nh\u1EADp portal"))),
+                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'cursor-pointer px-2 py-1.5 text-sm text-gray-900 hover:rounded-lg hover:bg-gray-100', onClick: handleProfilePage }, "Th\u00F4ng tin c\u00E1 nh\u00E2n")),
                                         react_2["default"].createElement(react_1.Menu.Item, null,
-                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'py-1.5 px-2 mb-2.5 cursor-pointer text-[#8e1f0c] text-sm hover:bg-gray-100 hover:rounded-lg', onClick: handleModalSignOut }, "\u0110\u0103ng xu\u1EA5t")))))))))),
+                                            react_2["default"].createElement("div", { "aria-hidden": true, className: 'mb-2.5 cursor-pointer px-2 py-1.5 text-sm text-[#8e1f0c] hover:rounded-lg hover:bg-gray-100', onClick: handleModalSignOut }, "\u0110\u0103ng xu\u1EA5t")))))))))),
         react_2["default"].createElement("div", null,
             react_2["default"].createElement(Modal_1.PHXModal, { dangerActionText: '\u0110\u0103ng xu\u1EA5t', onDangerClick: handleSignOut, onHide: function () { return setModalSignOut(false); }, primaryActionText: '', show: modalSignOut, title: '\u0110\u0103ng xu\u1EA5t' },
-                react_2["default"].createElement("div", { className: 'text-gray-700 text-sm' }, "Khi th\u1EF1c hi\u1EC7n thao t\u00E1c n\u00E0y b\u1EA1n s\u1EBD tho\u00E1t kh\u1ECFi trang qu\u1EA3n tr\u1ECB v\u00E0 tr\u1EDF v\u1EC1 trang \u0111\u0103ng nh\u1EADp"))),
-        react_2["default"].createElement(Modal_1.PHXModal, { onHide: function () { return setModal(false); }, primaryActionText: 'X\u00E1c nh\u1EADn', show: modal, onPrimaryClick: handlePrimaryModal, title: 'X\u00E1c nh\u1EADn thay \u0111\u1ED5i tr\u01B0\u1EDDng' },
+                react_2["default"].createElement("div", { className: 'text-sm text-gray-700' }, "Khi th\u1EF1c hi\u1EC7n thao t\u00E1c n\u00E0y b\u1EA1n s\u1EBD tho\u00E1t kh\u1ECFi trang qu\u1EA3n tr\u1ECB v\u00E0 tr\u1EDF v\u1EC1 trang \u0111\u0103ng nh\u1EADp"))),
+        react_2["default"].createElement(Modal_1.PHXModal, { onHide: function () { return setModal(false); }, onPrimaryClick: handlePrimaryModal, primaryActionText: 'X\u00E1c nh\u1EADn', show: modal, title: 'X\u00E1c nh\u1EADn thay \u0111\u1ED5i tr\u01B0\u1EDDng' },
             react_2["default"].createElement(Banner_1.PHXBanner, { description: 'Khi thay \u0111\u1ED5i tr\u01B0\u1EDDng t\u1EA5t c\u1EA3 d\u1EEF li\u1EC7u s\u1EBD hi\u1EC3n th\u1ECB theo tr\u01B0\u1EDDng v\u1EEBa \u0111\u01B0\u1EE3c ch\u1ECDn', onClose: function () { return setShowBanner(false); }, show: showBanner, title: 'L\u01B0u \u00FD', type: 'warning' })),
-        react_2["default"].createElement("div", { className: 'relative flex min-h-screen bg-[#f1f1f1]' },
+        react_2["default"].createElement("div", { className: 'relative flex min-h-screen bg-gray-100' },
             react_2["default"].createElement(react_1.Transition.Root, { as: react_2.Fragment, show: sidebarOpen },
                 react_2["default"].createElement(react_1.Dialog, { as: 'div', className: 'relative z-40 lg:hidden', onClose: setSidebarOpen },
                     react_2["default"].createElement(react_1.Transition.Child, { as: react_2.Fragment, enter: 'transition-opacity ease-linear duration-300', enterFrom: 'opacity-0', enterTo: 'opacity-100', leave: 'transition-opacity ease-linear duration-300', leaveFrom: 'opacity-100', leaveTo: 'opacity-0' },
@@ -662,77 +664,82 @@ var PHXMainWrapV3 = function (_a) {
                                             react_2["default"].createElement("span", { className: 'sr-only' }, "Close sidebar"),
                                             react_2["default"].createElement(outline_1.XMarkIcon, { "aria-hidden": 'true', className: 'h-6 w-6 text-white' })))),
                                 react_2["default"].createElement("div", { className: 'mt-8 h-0 flex-1 overflow-y-auto pb-4 pt-5' },
-                                    react_2["default"].createElement(nav_mobile_1["default"], { setSideBarOpen: function () { return setSidebarOpen(false); }, permission: perCode, menu: menu, path: pathNameWithBasePath, router: router })))),
+                                    react_2["default"].createElement(nav_mobile_1["default"], { menu: menu, path: pathNameWithBasePath, permission: perCode, router: router, setSideBarOpen: function () { return setSidebarOpen(false); } })))),
                         react_2["default"].createElement("div", { "aria-hidden": 'true', className: 'w-14 flex-shrink-0' })))),
             react_2["default"].createElement("div", { className: 'hidden lg:flex lg:flex-shrink-0' },
                 react_2["default"].createElement("div", { className: 'flex' },
                     react_2["default"].createElement("div", { className: 'mt-14 flex lg:inset-y-0' },
-                        react_2["default"].createElement("div", { "aria-hidden": true, className: "".concat(openNavName ? 'w-64' : 'w-14', " transition-all duration-300 z-10 flex h-full flex-col justify-between border-r bg-[#f1f1f1] lg:fixed menu-styled"), onMouseOver: function () { return setOpenNavName(true); }, onMouseOut: function () { return setOpenNavName(false); } },
-                            react_2["default"].createElement("div", { className: classNames('#ebebeb flex flex-1 flex-col', openNavName ? 'overflow-y-auto' : 'overflow-y-hidden') },
-                                react_2["default"].createElement("div", { className: 'flex-1 relative' },
-                                    react_2["default"].createElement("div", { "aria-label": 'Sidebar', className: 'hidden md:block md:flex-shrink-0 md:overflow-y-auto overflow-x-hidden' }, !hiddenLeftMenu && (react_2["default"].createElement("div", { className: "space-y- flex ".concat(openNavName ? 'w-64' : 'w-12', " flex-col overflow-hidden p-3") }, navigation.map(function (item, index) { return (react_2["default"].createElement("div", { key: index, className: 'w-full' }, (roleCode === null || roleCode === void 0 ? void 0 : roleCode.length) > 0 ? (react_2["default"].createElement(react_2["default"].Fragment, null, enablePer(item.code, perCode) && (react_2["default"].createElement("a", { className: "".concat(classNames(item.current && !openNavName
-                                            ? 'font-semibold menu-bg-color-icon-active-styled' // màu background của icon đang active của menu
-                                            : 'font-medium menu-icon-color-styled', // màu icon của menu
+                        react_2["default"].createElement("div", { "aria-hidden": true, className: "".concat(openNavName ? 'w-64' : 'w-14', " menu-styled z-10 flex h-full flex-col justify-between border-r !bg-gray-200 transition-all duration-300 lg:fixed"), onMouseOut: function () { return setOpenNavName(false); }, onMouseOver: function () { return setOpenNavName(true); } },
+                            react_2["default"].createElement("div", { className: classNames('flex flex-1 flex-col', openNavName ? 'overflow-y-auto' : 'overflow-y-hidden') },
+                                react_2["default"].createElement("div", { className: 'relative flex-1' },
+                                    react_2["default"].createElement("div", { "aria-label": 'Sidebar', className: 'hidden overflow-x-hidden md:block md:flex-shrink-0 md:overflow-y-auto' }, !hiddenLeftMenu && (react_2["default"].createElement("div", { className: "space-y- flex ".concat(openNavName ? 'w-64' : 'w-12', " flex-col overflow-hidden p-3") }, navigation.map(function (item, index) { return (react_2["default"].createElement("div", { key: index, className: 'w-full' }, (roleCode === null || roleCode === void 0 ? void 0 : roleCode.length) > 0 ? (react_2["default"].createElement(react_2["default"].Fragment, null, enablePer(item.code, perCode) && (react_2["default"].createElement("a", { className: "".concat(classNames(item.current && !openNavName
+                                            ? 'menu-bg-color-icon-active-styled font-semibold' // màu background của icon đang active của menu
+                                            : 'menu-icon-color-styled', // màu icon của menu
                                         !openNavName
                                             ? 'mb-1.5 inline-flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-lg'
-                                            : 'mb-1.5 inline-flex h-8 flex-shrink-0 items-center rounded-lg min-w-full', openNavName && item.current
-                                            ? 'rounded-lg menu-bg-color-icon-active-styled'
-                                            : 'hover:rounded-lg hover:bg-opacity-50 menu-hover-bg')), href: item.path, onClick: function () { return handleClicked(item.path); }, onMouseOver: function () { return setOpenNavName(true); } },
+                                            : 'mb-1.5 inline-flex h-8 min-w-full flex-shrink-0 items-center rounded-lg', openNavName && item.current
+                                            ? 'menu-bg-color-icon-active-styled rounded-lg'
+                                            : 'menu-hover-bg hover:rounded-lg hover:bg-opacity-50')), href: item.path, onClick: function () { return handleClicked(item.path); }, onMouseOver: function () { return setOpenNavName(true); } },
                                         react_2["default"].createElement("span", { className: 'sr-only' }, item.name),
                                         react_2["default"].createElement("span", { className: classNames(!openNavName
-                                                ? 'group cursor-pointer hover:fixed hover:z-10 focus-visible:outline-none mt-0.5'
+                                                ? 'group cursor-pointer hover:z-10 focus-visible:outline-none'
                                                 : "flex gap-x-2 ".concat(item.menuIconSL ? 'pl-[3px] pt-[2px]' : 'pl-[0.45rem]')) },
-                                            item.menuIconSL ? (react_2["default"].createElement("img", { src: item.menuIconSL, className: 'w-[1.6rem]', alt: 'icon' })) : (react_2["default"].createElement(react_fontawesome_1.FontAwesomeIcon, { className: 'h-[1.125rem] w-[1.125rem] mt-1', icon: item.image })),
+                                            item.menuIconSL ? (react_2["default"].createElement("img", { alt: 'icon', className: 'w-[1.6rem]', src: item.menuIconSL })) : (
+                                            // <FontAwesomeIcon
+                                            //   className="mt-1 h-[1.125rem] w-[1.125rem]"
+                                            //   icon={item.image}
+                                            // />
+                                            react_2["default"].createElement(image_1["default"], { alt: 'icon', className: classNames('h-[1.125rem] w-[1.125rem] text-gray-950', openNavName && 'mt-[0.2rem]'), height: 0, src: item.current ? Icon_1.Icons["".concat(item.code, "_SOLID")] : Icon_1.Icons[item.code], width: 0 })),
                                             openNavName && (react_2["default"].createElement("div", { className: 'h-6' },
-                                                react_2["default"].createElement("p", { className: "transition-all h-full duration-300 text-[0.86rem] mt-0.5 ".concat(openNavName ? 'opacity-100' : 'opacity-0', " ").concat(item.current ? 'font-semibold' : '') }, item.name)))))))) : (react_2["default"].createElement("a", { className: classNames(item.current && !openNavName
-                                            ? 'text-indigo-900 font-semibold menu-bg-color-icon-active-styled' // màu background của icon đang active trong menu
-                                            : 'text-gray-700 font-medium menu-icon-color-styled', // màu icon
+                                                react_2["default"].createElement("p", { className: "mt-0.5 h-full text-[0.86rem] text-[#353A44] transition-all duration-300 ".concat(openNavName ? 'opacity-100' : 'opacity-0') }, item.name)))))))) : (react_2["default"].createElement("a", { className: classNames(item.current && !openNavName
+                                            ? 'menu-bg-color-icon-active-styled font-semibold text-indigo-900' // màu background của icon đang active trong menu
+                                            : 'menu-icon-color-styled font-medium text-gray-700', // màu icon
                                         !openNavName
                                             ? 'mb-1.5 inline-flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-lg'
-                                            : 'mb-1.5 inline-flex h-8 flex-shrink-0 items-center rounded-lg min-w-full', openNavName && item.current
-                                            ? 'rounded-lg text-indigo-900 menu-bg-color-icon-active-styled' // màu background của icon đang active
-                                            : 'hover:rounded-lg hover:bg-opacity-50 menu-hover-bg'), href: item.path, onClick: function () { return handleClicked(item.path); }, onMouseOver: function () { return setOpenNavName(true); } },
+                                            : 'mb-1.5 inline-flex h-8 min-w-full flex-shrink-0 items-center rounded-lg', openNavName && item.current
+                                            ? 'menu-bg-color-icon-active-styled rounded-lg text-indigo-900' // màu background của icon đang active
+                                            : 'menu-hover-bg hover:rounded-lg hover:bg-opacity-50'), href: item.path, onClick: function () { return handleClicked(item.path); }, onMouseOver: function () { return setOpenNavName(true); } },
                                         react_2["default"].createElement("span", { className: classNames(!openNavName
-                                                ? 'group cursor-pointer hover:fixed hover:z-10 focus-visible:outline-none mt-0.5'
+                                                ? 'group mt-0.5 cursor-pointer hover:z-10 focus-visible:outline-none'
                                                 : "flex gap-x-2 ".concat(item.menuIconSL ? 'pl-[3px] pt-[2px]' : 'pl-[0.45rem]')) },
-                                            item.menuIconSL ? (react_2["default"].createElement("img", { src: item.menuIconSL, className: 'w-[1.6rem]', alt: 'icon' })) : (react_2["default"].createElement(react_fontawesome_1.FontAwesomeIcon, { className: 'h-[1.125rem] w-[1.125rem] mt-1', icon: item.image })),
+                                            item.menuIconSL ? (react_2["default"].createElement("img", { alt: 'icon', className: 'w-[1.6rem]', src: item.menuIconSL })) : (react_2["default"].createElement(react_fontawesome_1.FontAwesomeIcon, { className: 'mt-1 h-[1.125rem] w-[1.125rem]', icon: item.image })),
                                             openNavName && (react_2["default"].createElement("div", { className: 'h-6' },
-                                                react_2["default"].createElement("p", { className: "transition-all h-full duration-300 text-[0.86rem] mt-0.5 ".concat(openNavName ? 'opacity-100' : 'opacity-0', " ").concat(item.current ? 'font-semibold' : '', " ") }, item.name)))))))); })))))),
+                                                react_2["default"].createElement("p", { className: "mt-0.5 h-full text-[0.86rem] transition-all duration-300 ".concat(openNavName ? 'opacity-100' : 'opacity-0', " ").concat(item.current ? 'font-semibold' : '', " ") }, item.name)))))))); })))))),
                             react_2["default"].createElement("div", { className: classNames('border-t', navigation.length > 0 && ((_e = navigation[0]) === null || _e === void 0 ? void 0 : _e.isSchoolink) ? 'border-[#1c222b]' : 'border-indigo-100') },
-                                react_2["default"].createElement("div", { className: "mb-14 space-y- flex ".concat(openNavName ? 'w-64' : 'w-12', " overflow-hidden p-3") },
-                                    react_2["default"].createElement("a", { className: classNames('text-gray-700 font-medium', !openNavName
+                                react_2["default"].createElement("div", { className: "mb-14 flex ".concat(openNavName ? 'w-64' : 'w-12', " overflow-hidden p-3") },
+                                    react_2["default"].createElement("a", { className: classNames('z-0', !openNavName
                                             ? 'inline-flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-lg'
-                                            : 'inline-flex h-8 flex-shrink-0 items-center rounded-lg hover:rounded-lg hover:bg-opacity-50 min-w-full', isSettings() && !openNavName
-                                            ? 'text-indigo-900 font-semibold setting-bg-icon-active' // màu background của icon đang active trong menu
-                                            : 'text-gray-700 font-medium setting-icon-color', // màu icon
+                                            : 'inline-flex h-8 min-w-full flex-shrink-0 items-center rounded-lg hover:rounded-lg hover:bg-opacity-50', isSettings() && !openNavName
+                                            ? 'setting-bg-icon-active' // màu background của icon đang active trong menu
+                                            : 'setting-icon-color font-medium', // màu icon
                                         openNavName && isSettings()
-                                            ? 'rounded-lg text-indigo-900 setting-bg-icon-active' // màu background của icon đang active trong menu
-                                            : 'hover:rounded-lg hover:bg-opacity-50 setting-hover-bg'), href: '/setting', 
+                                            ? 'setting-bg-icon-active rounded-lg' // màu background của icon đang active trong menu
+                                            : 'setting-hover-bg hover:rounded-lg hover:bg-opacity-50'), href: '/setting', 
                                         // onClick={() => handleClicked(item.path)}
                                         onMouseOver: function () { return setOpenNavName(true); } },
                                         react_2["default"].createElement("span", { className: 'sr-only' }, "setting"),
                                         react_2["default"].createElement("span", { className: classNames(!openNavName
-                                                ? 'group cursor-pointer p-4 hover:fixed hover:z-10 focus-visible:outline-none mt-0.5'
+                                                ? 'cursor-pointer hover:z-10 focus-visible:outline-none'
                                                 : 'flex gap-x-2 pl-[0.45rem]') },
-                                            react_2["default"].createElement(react_fontawesome_1.FontAwesomeIcon, { className: 'h-[1.125rem] w-[1.125rem] mt-1', icon: 'fa-solid fa-gear' }),
+                                            react_2["default"].createElement(image_1["default"], { alt: 'icon', className: classNames('h-[1.125rem] w-[1.125rem]', openNavName ? 'mt-[0.2rem]' : ''), height: 0, src: isSettings() ? Icon_1.Icons.SETTING_SOLID : Icon_1.Icons.SETTING, width: 0 }),
                                             openNavName && (react_2["default"].createElement("div", { className: 'h-6' },
-                                                react_2["default"].createElement("p", { className: "transition-all h-full duration-300 text-[0.86rem] setting-text-color mt-0.5 ".concat(openNavName ? 'opacity-100' : 'opacity-0', " ").concat(isSettings() ? 'font-semibold' : '', " ") }, "C\u00E0i \u0111\u1EB7t")))))))),
+                                                react_2["default"].createElement("p", { className: "setting-text-color mt-0.5 h-full text-[0.86rem] font-normal text-[#353A44] transition-all duration-300 hover:cursor-pointer ".concat(openNavName ? 'opacity-100' : 'opacity-0') }, "C\u00E0i \u0111\u1EB7t")))))))),
                         !hiddenLeftMenu && (react_2["default"].createElement(react_1.Transition, { as: react_2.Fragment, enter: 'transition ease-in-out duration-300 transform', enterFrom: '-translate-x-full', enterTo: 'translate-x-0', leave: 'transition ease-in-out duration-300 transform', leaveFrom: 'translate-x-0', leaveTo: '-translate-x-full', show: openSubMenu },
-                            react_2["default"].createElement("aside", { className: 'z-9 fixed ml-[3.438rem] hidden h-full bg-[#ebebeb] lg:block lg:flex-shrink-0' },
-                                react_2["default"].createElement("div", { className: 'relative flex h-full w-64 flex-col overflow-y-auto border-r border-gray-200 bg-[#ebebeb]' },
+                            react_2["default"].createElement("aside", { className: 'z-9 fixed ml-[3.438rem] hidden h-full bg-gray-200/20 lg:block lg:flex-shrink-0' },
+                                react_2["default"].createElement("div", { className: 'relative flex h-full w-64 flex-col overflow-y-auto bg-gray-200/20' },
                                     checkAdmissions(pathNameWithBasePath) &&
                                         checkChildrenCampaign(pathNameWithBasePath) &&
                                         pathNameWithBasePath !== '/admissions/campaign/list' && (react_2["default"].createElement("div", { className: 'mx-1 flex items-center p-2 pb-0' },
-                                        react_2["default"].createElement("button", { className: 'inline-flex items-center rounded-lg border-gray-300 bg-transparent mr-1 px-2 py-1 text-xs font-medium text-gray-700 hover:bg-gray-200 active:bg-gray-300 active:pb-[0.2rem] active:pt-[0.3rem] active:shadow-[0rem_0.125rem_0.1rem_0rem_#0004_inset]', onClick: function () { return handleBackMenu(); }, type: 'button' },
+                                        react_2["default"].createElement("button", { className: 'mr-1 inline-flex items-center rounded-lg border-gray-300 bg-transparent px-2 py-1 text-xs font-medium text-gray-700 hover:bg-gray-200 active:bg-gray-300 active:pb-[0.2rem] active:pt-[0.3rem] active:shadow-[0rem_0.125rem_0.1rem_0rem_#0004_inset]', onClick: function () { return handleBackMenu(); }, type: 'button' },
                                             react_2["default"].createElement(solid_1.ArrowLeftIcon, { className: 'h-5 w-5' })),
-                                        react_2["default"].createElement("p", { className: 'font-medium text-sm text-slate-600' }, campaignName))),
+                                        react_2["default"].createElement("p", { className: 'text-sm font-medium text-slate-600' }, campaignName))),
                                     react_2["default"].createElement("div", { className: 'flex-1 overflow-y-auto pt-3' }, subNavigation.map(function (item, subNavIndex) { return (react_2["default"].createElement("div", { key: subNavIndex }, (roleCode === null || roleCode === void 0 ? void 0 : roleCode.length) > 0 ? (react_2["default"].createElement(react_2["default"].Fragment, null, enablePer(item.code, perCode) ? (react_2["default"].createElement(react_2["default"].Fragment, null,
-                                        react_2["default"].createElement("div", { "aria-hidden": true, "aria-current": (item === null || item === void 0 ? void 0 : item.current) ? 'page' : undefined, className: classNames((item === null || item === void 0 ? void 0 : item.current)
+                                        react_2["default"].createElement("div", { "aria-current": (item === null || item === void 0 ? void 0 : item.current) ? 'page' : undefined, "aria-hidden": true, className: classNames((item === null || item === void 0 ? void 0 : item.current)
                                                 ? 'rounded-lg bg-white' // màu background menu cha khi active
                                                 : 'hover:rounded-lg hover:bg-white hover:bg-opacity-50', // màu background khi hover vào menu cha
-                                            'mx-1 flex cursor-pointer border-slate-200 p-2'), onClick: function () { return subNavigationTriggerClicked(item); } }, !loadingMenu ? (react_2["default"].createElement("div", { className: 'ml-1 text-[0.84rem] flex items-center' },
+                                            'mx-3 flex cursor-pointer border-slate-200 p-2'), onClick: function () { return subNavigationTriggerClicked(item); } }, !loadingMenu ? (react_2["default"].createElement("div", { className: 'ml-1 flex items-center text-[0.84rem]' },
                                             react_2["default"].createElement("div", { className: 'flex items-center gap-x-3' },
-                                                react_2["default"].createElement("p", { className: classNames('leading-5', (item === null || item === void 0 ? void 0 : item.current) ? 'font-semibold' : 'font-medium text-gray-800') }, item === null || item === void 0 ? void 0 : item.name)),
+                                                react_2["default"].createElement("p", { className: classNames('leading-5', (item === null || item === void 0 ? void 0 : item.current) ? '' : 'font-normal text-[#353A44]') }, item === null || item === void 0 ? void 0 : item.name)),
                                             react_2["default"].createElement("p", { className: 'mt-1 text-slate-500' }, item === null || item === void 0 ? void 0 : item.description))) : (react_2["default"].createElement(Skeleton_1.PHXSkeleton, { className: 'mr-3 flex-1', type: 'single' }))),
                                         item.showChild && item.child && (react_2["default"].createElement(react_2["default"].Fragment, null, item.child.map(function (children, childIndex) { return (react_2["default"].createElement("div", { key: childIndex, className: classNames('relative') },
                                             react_2["default"].createElement("div", { style: (children === null || children === void 0 ? void 0 : children.current)
@@ -740,9 +747,9 @@ var PHXMainWrapV3 = function (_a) {
                                                     : checkChildBefore(item.child, children)
                                                         ? sub_menu_style_1.styles.childMenuBefBefore
                                                         : {} }),
-                                            react_2["default"].createElement("div", { "aria-hidden": true, className: classNames('mx-1 flex cursor-pointer border-slate-200 p-2 text-[0.84rem]', (children === null || children === void 0 ? void 0 : children.current)
-                                                    ? 'rounded-lg bg-white text-gray-900' // màu chữ menu con khi active
-                                                    : 'hover:rounded-lg hover:bg-white hover:bg-opacity-50 hover:text-gray-900'), onClick: enablePer(children.code, perCode)
+                                            react_2["default"].createElement("div", { "aria-hidden": true, className: classNames('mx-3 flex cursor-pointer border-slate-200 p-2 text-[0.84rem]', (children === null || children === void 0 ? void 0 : children.current)
+                                                    ? 'rounded-lg bg-white text-[#353A44]' // màu chữ menu con khi active
+                                                    : 'hover:rounded-lg hover:bg-white hover:bg-opacity-50 hover:text-[#353A44]'), onClick: enablePer(children.code, perCode)
                                                     ? function () { return subNavigationTriggerClicked(children, item); }
                                                     : undefined },
                                                 react_2["default"].createElement("div", { className: 'flex items-center gap-x-3' },
@@ -750,8 +757,8 @@ var PHXMainWrapV3 = function (_a) {
                                                     react_2["default"].createElement("p", { className: classNames('my-[0.05rem] ml-3 leading-5', !enablePer(children.code, perCode)
                                                             ? 'font-normal text-gray-300'
                                                             : (children === null || children === void 0 ? void 0 : children.current)
-                                                                ? 'font-semibold'
-                                                                : 'font-normal text-gray-500') }, children.name))),
+                                                                ? ''
+                                                                : 'font-normal text-[#353A44]') }, children.name))),
                                             react_2["default"].createElement("div", { style: (children === null || children === void 0 ? void 0 : children.current)
                                                     ? sub_menu_style_1.styles.childMenuActiveAfter
                                                     : checkChildBefore(item.child, children)
@@ -759,15 +766,15 @@ var PHXMainWrapV3 = function (_a) {
                                                         : {} }))); }))))) : (react_2["default"].createElement("div", { "aria-current": (item === null || item === void 0 ? void 0 : item.current) ? 'page' : undefined, className: classNames((item === null || item === void 0 ? void 0 : item.current)
                                             ? 'rounded-lg bg-white '
                                             : 'hover:rounded-lg hover:bg-white hover:bg-opacity-50', // hover:bg-white
-                                        'mx-1 flex cursor-pointer border-slate-200 p-2') }, !loadingMenu ? (react_2["default"].createElement("div", { className: 'ml-1 text-[0.84rem] flex items-center' },
+                                        'mx-3 flex cursor-pointer border-slate-200 p-2') }, !loadingMenu ? (react_2["default"].createElement("div", { className: 'ml-1 flex items-center text-[0.84rem]' },
                                         react_2["default"].createElement("div", { className: 'flex items-center gap-x-3 text-gray-700' },
-                                            react_2["default"].createElement("p", { className: classNames('leading-5 font-medium text-gray-300') }, item === null || item === void 0 ? void 0 : item.name)),
+                                            react_2["default"].createElement("p", { className: classNames('font-normal leading-5 text-gray-300') }, item === null || item === void 0 ? void 0 : item.name)),
                                         react_2["default"].createElement("p", { className: 'mt-1 text-slate-500' }, item === null || item === void 0 ? void 0 : item.description))) : (react_2["default"].createElement(Skeleton_1.PHXSkeleton, { className: 'mr-3 flex-1', type: 'single' })))))) : (react_2["default"].createElement(react_2["default"].Fragment, null,
-                                        react_2["default"].createElement("div", { "aria-hidden": true, "aria-current": (item === null || item === void 0 ? void 0 : item.current) ? 'page' : undefined, className: classNames((item === null || item === void 0 ? void 0 : item.current)
+                                        react_2["default"].createElement("div", { "aria-current": (item === null || item === void 0 ? void 0 : item.current) ? 'page' : undefined, "aria-hidden": true, className: classNames((item === null || item === void 0 ? void 0 : item.current)
                                                 ? 'rounded-lg bg-white'
-                                                : 'hover:rounded-lg hover:bg-white hover:bg-opacity-50', 'mx-1 flex cursor-pointer border-slate-200 p-2'), onClick: function () { return subNavigationTriggerClicked(item); } }, !loadingMenu ? (react_2["default"].createElement("div", { className: 'ml-3 text-[0.84rem] flex items-center' },
+                                                : 'hover:rounded-lg hover:bg-white hover:bg-opacity-50', 'mx-1 flex cursor-pointer border-slate-200 p-2'), onClick: function () { return subNavigationTriggerClicked(item); } }, !loadingMenu ? (react_2["default"].createElement("div", { className: 'ml-3 flex items-center text-[0.84rem]' },
                                             react_2["default"].createElement("div", { className: 'flex items-center gap-x-3 text-gray-700' },
-                                                react_2["default"].createElement("p", { className: classNames('leading-5 font-normal text-gray-500') }, item === null || item === void 0 ? void 0 : item.name)),
+                                                react_2["default"].createElement("p", { className: classNames('font-normal leading-5 text-gray-500') }, item === null || item === void 0 ? void 0 : item.name)),
                                             react_2["default"].createElement("p", { className: 'mt-1 text-slate-500' }, item === null || item === void 0 ? void 0 : item.description))) : (react_2["default"].createElement(Skeleton_1.PHXSkeleton, { className: 'mr-3 flex-1', type: 'single' }))),
                                         item.showChild && item.child && (react_2["default"].createElement(react_2["default"].Fragment, null, item.child.map(function (children, index) { return (react_2["default"].createElement("div", { key: index, className: classNames('relative', (children === null || children === void 0 ? void 0 : children.current) && 'child-menu-active', checkChildBefore(item.child, children) && 'child-menu-bef') },
                                             react_2["default"].createElement("div", { "aria-hidden": true, className: classNames('mx-1 flex cursor-pointer border-slate-200 p-2 text-[0.84rem]', (children === null || children === void 0 ? void 0 : children.current)
@@ -775,12 +782,12 @@ var PHXMainWrapV3 = function (_a) {
                                                     : 'hover:rounded-lg hover:bg-white hover:bg-opacity-50 hover:text-gray-900'), onClick: function () { return subNavigationTriggerClicked(children, item); } },
                                                 react_2["default"].createElement("div", { className: 'flex items-center gap-x-3' },
                                                     react_2["default"].createElement("div", { className: 'w-3' }),
-                                                    react_2["default"].createElement("p", { className: classNames('ml-3 leading-5 my-[0.05rem]', (children === null || children === void 0 ? void 0 : children.current) ? 'font-semibold' : 'text-gray-500 font-normal') }, children.name))))); }))))))); }))))))))),
+                                                    react_2["default"].createElement("p", { className: classNames('my-[0.05rem] ml-3 leading-5', (children === null || children === void 0 ? void 0 : children.current) ? 'font-semibold' : 'font-normal text-gray-500') }, children.name))))); }))))))); }))))))))),
             react_2["default"].createElement("div", { className: 'flex min-w-0 flex-1 flex-col overflow-hidden' },
                 react_2["default"].createElement("main", { className: 'flex flex-1 overflow-hidden' },
                     react_2["default"].createElement("section", { "aria-labelledby": 'primary-heading', className: 'flex h-full min-w-0 flex-1 flex-col lg:order-last' },
-                        react_2["default"].createElement("div", { className: 'bg-bgcl-50 sticky top-0 z-10 flex h-14 flex-shrink-0 border-b border-l px-4 sm:px-6 lg:px-4' }),
-                        react_2["default"].createElement("div", { className: "".concat(openSubMenu ? 'lg:ml-[20.063rem]' : 'lg:ml-[5.063rem]', " bg-[#f1f1f1] px-6") },
+                        react_2["default"].createElement("div", { className: 'sticky top-0 z-10 flex h-14 flex-shrink-0 border-b border-l bg-bgcl-50 px-4 sm:px-6 lg:px-4' }),
+                        react_2["default"].createElement("div", { className: "".concat(openSubMenu ? 'lg:ml-[20.063rem]' : 'lg:ml-[5.063rem]', " bg-gray-100 px-6") },
                             react_2["default"].createElement("div", { className: 'py-4' }, isLoadingPermission ? ('') : enablePer(currentCode, perCode) ? (children) : (react_2["default"].createElement(Card_1.PHXCard, null,
                                 react_2["default"].createElement("div", { className: 'mb-10 mt-10 sm:mb-20 sm:mt-20 lg:mb-32 lg:mt-32' },
                                     react_2["default"].createElement("div", { className: 'flex items-center justify-center' },