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

Fix: middleware

Browse Source 
Deskripsi
- Fix middleware
- Fix metode login ( sekarang menggunakan api )
This commit is contained in:
Bagasbanuna02
2024-12-02 16:24:03 +08:00
parent 45279cd37f
commit 31124c5500
55 changed files with 1675 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/dev/auth/login/page.tsx
View File

@@ -6,9 +6,9 @@ import { redirect } from "next/navigation";
export default async function Page() {
const version = versionUpdate.version;
const checkCookies = await funCheckCookies();
console.log(checkCookies, "ini halaman login");
if (!checkCookies) return redirect("/");
// const checkCookies = await funCheckCookies();
// console.log(checkCookies, "ini halaman login");
// if (!checkCookies) return redirect("/");
return (
<>

2
src/app/dev/auth/register/[id]/page.tsx
View File

@@ -4,5 +4,5 @@ import { auth_getCodeOtpByNumber } from "@/app_modules/auth/fun/get_kode_otp_by_
export default async function Page({ params }: { params: { id: string } }) {
let otpId = params.id;
const dataOtp = await auth_getCodeOtpByNumber({ kodeId: otpId });
return <Register dataOtp={dataOtp} />;
return <Register />;
}

2
src/app/dev/auth/splash/page.tsx
View File

@@ -3,7 +3,7 @@ import { SplashScreen } from "@/app_modules/auth";
export default async function PageSplash() {
return (
<>
<SplashScreen checkCookies/>
<SplashScreen />
</>
);
}

3
src/app/dev/auth/validasi/[id]/page.tsx
View File

@@ -5,6 +5,5 @@ export default async function Page({ params }: { params: { id: string } }) {
let kodeId = params.id;
const dataOtp = await auth_getCodeOtpByNumber({ kodeId: kodeId });
return <Validasi dataOtp={dataOtp as any} />;
return <Validasi />;
}

16
src/app/dev/check-cookies/page.tsx
View File

@@ -6,16 +6,16 @@ import { CheckCookies_UiView } from "@/app_modules/check_cookies";
import { redirect } from "next/navigation";
export default async function Page() {
const userLoginId = await funGetUserIdByToken();
const dataUser = await funGlobal_getUserById({ userId: userLoginId });
// const userLoginId = await funGetUserIdByToken();
// const dataUser = await funGlobal_getUserById({ userId: userLoginId });
if (dataUser?.masterUserRoleId === "1") {
return redirect(RouterHome.main_home);
}
// if (dataUser?.masterUserRoleId === "1") {
// return redirect(RouterHome.main_home);
// }
if (dataUser?.masterUserRoleId !== "1") {
return redirect(RouterAdminDashboard.splash_admin);
}
// if (dataUser?.masterUserRoleId !== "1") {
// return redirect(RouterAdminDashboard.splash_admin);
// }
// return <CheckCookies_UiView />;
}

2
src/app/dev/forum/detail/main-detail/[id]/page.tsx
View File

@@ -16,7 +16,7 @@ export default async function Page({ params }: { params: { id: string } }) {
page: 1,
});
dataPosting?.isActive === false && redirect(RouterForum.beranda);
// dataPosting?.isActive === false && redirect(RouterForum.beranda);
const countKomentar = await forum_countTotalKomenById(postingId);

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

@@ -1,10 +1,14 @@
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";
export default async function Page() {
import { cookies } from "next/headers";
import { redirect } from "next/navigation";
export default async function PageHome() {
const userLoginId = await funGetUserIdByToken();
const dataUser = await user_getOneByUserId(userLoginId as string);
const dataJob = await job_getTwoForHomeView();
@@ -16,8 +20,8 @@ export default async function Page() {
// if (dataUser?.active === false) {
// return redirect(RouterHome.home_user_non_active);
// }
// if (dataUser?.masterUserRoleId === "2" || dataUser?.masterUserRoleId === "3")
// return redirect(RouterAdminDashboard.splash_admin);
if (dataUser?.masterUserRoleId === "2" || dataUser?.masterUserRoleId === "3")
return redirect(RouterAdminDashboard.main_admin);
return (
<>

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

@@ -1,28 +1,23 @@
import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
import { funCheckCookies } from "@/app_modules/_global/fun/get/fun_check_cookies";
import { permanentRedirect, redirect } from "next/navigation";
import { funGlobal_getUserById } from "@/app_modules/_global/fun/get/fun_get_user_by_id";
import { redirect } from "next/navigation";
import { RealtimeProvider } from "../lib";
import { ServerEnv } from "../lib/server_env";
import { funGlobal_getUserById } from "@/app_modules/_global/fun/get/fun_get_user_by_id";
import { RouterHome } from "../lib/router_hipmi/router_home";
import { CheckCookies_UiLayout } from "@/app_modules/check_cookies";
import { RouterAdminDashboard } from "../lib/router_hipmi/router_admin";
import { funGlobal_checkActivationUseById } from "@/app_modules/_global/fun/get/fun_check_activation_use_by_id";
export default async function Layout({
children,
}: {
children: React.ReactNode;
}) {
const checkCookies = await funCheckCookies();
const userLoginId = await funGetUserIdByToken();
if (!checkCookies) return redirect("/");
// const dataUser = await funGlobal_getUserById({ userId: userLoginId });
// console.log(dataUser?.active, dataUser?.username, "ini di layout");
// if(dataUser?.active == false) return permanentRedirect(RouterHome.home_user_non_active);
// const WIBU_REALTIME_TOKEN = process.env.NEXT_PUBLIC_WIBU_REALTIME_TOKEN;
// console.log(WIBU_REALTIME_TOKEN, "check cookies di layout dalam");
const activationUser = await funGlobal_checkActivationUseById({
userId: userLoginId as string,
});
console.log(activationUser, "ini di layout");
if (activationUser == false) return redirect("/waiting-room");
return (
<>
<RealtimeProvider

2
src/app/dev/user-not-active/page.tsx
View File

@@ -1,6 +1,4 @@
import { Home_UserNonActive } from "@/app_modules/home";
// import { redirect } from "next/navigation";
export default async function Page() {
return (
<>

2
src/app/dev/vote/detail/semua_riwayat/[id]/layout.tsx
View File

@@ -16,7 +16,7 @@ export default async function Layout({
<>
<LayoutVote_DetailSemuaRiwayat
votingId={votingId}
userLoginId={userLoginId}
userLoginId={userLoginId as string}
>
{children}
</LayoutVote_DetailSemuaRiwayat>