Compare commits
48 Commits
e3a4ef7a80
...
3e680a5a50
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e680a5a50 | |||
| e1113c49b3 | |||
| e964bb70ae | |||
| f01b6941ba | |||
| e78f3ffdb5 | |||
| 713df0b615 | |||
| f2615fbcea | |||
| 4f7d6fe4af | |||
| 96a3fd451b | |||
| d1befadd1c | |||
| fa99eb41dd | |||
| 11cc3662cf | |||
| d9a2f90056 | |||
| 23ee0468ad | |||
| 83ba84cf6f | |||
| 96d2a25081 | |||
| d54f85cf3d | |||
| 371870cbe5 | |||
| dd31763fdd | |||
| c9a64e2e7c | |||
| 733603fffa | |||
| bc92f8be0e | |||
| 9ced82b154 | |||
| d9bc68d6ac | |||
| 248e4cfeef | |||
| 9707990211 | |||
| 60672ba751 | |||
| 3b8190b080 | |||
| c1577ff432 | |||
| 40b382ca62 | |||
| 1ec3de0f02 | |||
| f5c035081c | |||
| 885e0ce348 | |||
| 7a59da77f2 | |||
| 82fb85ba0d | |||
| 0d263f6941 | |||
| 1762c70859 | |||
| c196b1d612 | |||
| 8926bfde00 | |||
| 256405b5a5 | |||
| eecf35fc9c | |||
| 700b18160c | |||
| 2dd6947bd6 | |||
| fe8ab62e94 | |||
| a0d476042b | |||
| 8e99a2e5e5 | |||
| 4b9f96f3b0 | |||
| 390107a1fb |
@@ -15,6 +15,7 @@ import { ChangeSubModule } from "./SubModuleForm";
|
||||
|
||||
import { Skeleton } from "@/components/ui/skeleton";
|
||||
import { getSubModules } from "@/utils/querys/admin/subModules";
|
||||
import { useEffect } from "react";
|
||||
|
||||
export type Settings = {
|
||||
settings_id?: string;
|
||||
@@ -28,14 +29,34 @@ export default function SubModulePage() {
|
||||
const { modules } = useModuleStore();
|
||||
const router = useRouter();
|
||||
|
||||
const adminModule = modules.filter((n) => n.name === "admin");
|
||||
const userLevel =
|
||||
user?.roles.filter((r) => r.module_id === adminModule[0].module_id) ||
|
||||
[];
|
||||
// const adminModule = modules.filter((n) => n.name === "admin");
|
||||
// const userLevel =
|
||||
// user?.roles.filter((r) => r.module_id === adminModule[0].module_id) ||
|
||||
// [];
|
||||
|
||||
if (!adminModule[0].roles.includes(userLevel[0]?.role)) {
|
||||
router.navigate({ to: "/" });
|
||||
}
|
||||
// if (!adminModule[0]?.roles.includes(userLevel[0]?.role)) {
|
||||
// //router.navigate({ to: "/" });
|
||||
// }
|
||||
|
||||
useEffect(() => {
|
||||
if (!user || modules.length === 0) return;
|
||||
|
||||
const adminModule = modules.find((n) => n.name === "admin");
|
||||
if (!adminModule) {
|
||||
console.log("no module loaded");
|
||||
//router.navigate({ to: "/" });
|
||||
return;
|
||||
}
|
||||
|
||||
const userLevel =
|
||||
user?.roles?.filter((r) => r.module_id === adminModule.module_id) ||
|
||||
[];
|
||||
|
||||
if (!adminModule.roles?.includes(userLevel[0]?.role)) {
|
||||
console.log("Something failed");
|
||||
//router.navigate({ to: "/" });
|
||||
}
|
||||
}, [modules, user, router]);
|
||||
|
||||
const { data, isError, error, isLoading } = useQuery(
|
||||
getSubModules(token ?? "")
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
}
|
||||
},
|
||||
"admConfig": {
|
||||
"build": 481,
|
||||
"build": 528,
|
||||
"oldBuild": "backend-0.1.3.zip"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
Reference in New Issue
Block a user