wibu/hipmi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix redirect

Browse Source
This commit is contained in:
Bagasbanuna02
2024-12-03 13:32:25 +08:00
parent 304476b367
commit dc69a67a84
7 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/dev/admin/layout.tsx
View File

@@ -5,8 +5,9 @@ import adminNotifikasi_countNotifikasi from "@/app_modules/admin/notifikasi/fun/
import adminNotifikasi_getByUserId from "@/app_modules/admin/notifikasi/fun/get/get_notifikasi_by_user_id";
import React from "react";
import versionUpdate from "../../../../package.json";
import { redirect } from "next/navigation";
export default async function Layout({
export default async function Layout({
children,
}: {
children: React.ReactNode;
@@ -14,10 +15,14 @@ export default async function Layout({
const userLoginId = await funGetUserIdByToken();
const version = versionUpdate.version;
const dataUser = await funGlobal_getUserById({ userId: userLoginId as string});
const listNotifikasi = await adminNotifikasi_getByUserId({page: 1});
const dataUser = await funGlobal_getUserById({
userId: userLoginId as string,
});
const listNotifikasi = await adminNotifikasi_getByUserId({ page: 1 });
const countNotifikasi = await adminNotifikasi_countNotifikasi();
if (dataUser?.masterUserRoleId == "1") return redirect("/dev/home");
return (
<>
<Admin_NewLayout

6
src/app/dev/home/page.tsx
View File

@@ -1,10 +1,8 @@
import { RouterAdminDashboard } from "@/app/lib/router_hipmi/router_admin";
import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
import { HomeView } from "@/app_modules/home";
import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
import { job_getTwoForHomeView } from "@/app_modules/job/fun/get/get_two_for_home_view";
import notifikasi_countUserNotifikasi from "@/app_modules/notifikasi/fun/count/fun_count_by_id";
import { redirect } from "next/navigation";
export default async function PageHome() {
const userLoginId = await funGetUserIdByToken();
@@ -19,8 +17,8 @@ export default async function PageHome() {
// return redirect(RouterHome.home_user_non_active);
// }
if (dataUser?.masterUserRoleId === "2" || dataUser?.masterUserRoleId === "3")
return redirect(RouterAdminDashboard.main_admin);
// if (dataUser?.masterUserRoleId === "2" || dataUser?.masterUserRoleId === "3")
// return redirect(RouterAdminDashboard.main_admin);
return (
<>

16
src/app/dev/layout.tsx
View File

@@ -12,12 +12,18 @@ export default async function Layout({
children: React.ReactNode;
}) {
const userLoginId = await funGetUserIdByToken();
const activationUser = await funGlobal_checkActivationUseById({
userId: userLoginId as string,
});
// const dataUser = await funGlobal_getUserById({
// userId: userLoginId as string,
// });
// if (dataUser?.masterUserRoleId != "1") return redirect("/dev/home");
// const activationUser = await funGlobal_checkActivationUseById({
// userId: userLoginId as string,
// });
// if (activationUser == false) return redirect("/waiting-room");
if (activationUser == false) return redirect("/waiting-room");
return (
<>
<RealtimeProvider