Fix: Cookies

src/app_modules/_global/fun/get/fun_check_cookies.ts

@@ -0,0 +1,28 @@
+"use server";
+
+import { ServerEnv } from "@/app/lib/server_env";
+import { unsealData } from "iron-session";
+import _ from "lodash";
+import { cookies } from "next/headers";
+
+export async function funCheckCookies() {
+  const c = cookies().get("mySession");
+
+  if (!c || !c?.value || _.isEmpty(c?.value) || _.isUndefined(c?.value)) {
+    // console.log("return pertama");
+    return false;
+  }
+
+  const token = JSON.parse(
+    await unsealData(c?.value as string, {
+      password: ServerEnv.value?.WIBU_PWD as string,
+    })
+  );
+
+  if (_.isEmpty(token)) {
+    // console.log("return kedua");
+    return false;
+  }
+
+  return true;
+}

src/app_modules/_global/fun/get/fun_get_user_id_by_token.ts

@@ -1,17 +1,26 @@
 "use server";
 
-import prisma from "@/app/lib/prisma";
+import { ServerEnv } from "@/app/lib/server_env";
+import { unsealData } from "iron-session";
 import { cookies } from "next/headers";
 
 export async function funGetUserIdByToken() {
-  const c = cookies().get("mySession");
-  const token = c?.value
-  const cekToken = await prisma.userSession.findFirst({
-    where: {
-      token: token,
-    },
-  });
+   const c = cookies().get("mySession");
 
-  if (cekToken === null) return null
-  return cekToken.userId;
+   const token = JSON.parse(
+     await unsealData(c?.value as string, {
+       password: process.env.WIBU_PWD as string,
+     })
+   );
+
+   return token.id;
+  // const token = c?.value
+  // const cekToken = await prisma.userSession.findFirst({
+  //   where: {
+  //     token: token,
+  //   },
+  // });
+
+  // if (cekToken === null) return null
+  // return cekToken.userId;
 }

src/app_modules/_global/fun/upload/fun_upload_to_storage.ts

@@ -1,4 +1,6 @@
+import { ServerEnv } from "@/app/lib/server_env";
 import { TokenStorage } from "@/app/lib/token";
+import { envs } from "@/lib/envs";
 
 export async function funGlobal_UploadToStorage({
   file,
@@ -7,7 +9,7 @@ export async function funGlobal_UploadToStorage({
   file: File;
   dirId: string;
 }) {
-  if (!file) console.log("Tidak ada file");
+  const Env_WS_APIKEY = TokenStorage.value;
 
   const allowedMimeTypes = [
     "image/png",
@@ -35,7 +37,7 @@ export async function funGlobal_UploadToStorage({
       method: "POST",
       body: formData,
       headers: {
-        Authorization: `Bearer ${TokenStorage.value}`,
+        Authorization: `Bearer ${Env_WS_APIKEY}`,
       },
     });
 
@@ -52,4 +54,6 @@ export async function funGlobal_UploadToStorage({
     console.error("Error:", error);
     return { success: false, data: {} };
   }
+
+  return { success: false, data: { id: "" } };
 }

src/app_modules/admin/main_dashboard/main/view.tsx

@@ -1,17 +1,14 @@
 "use client";
 
-import {
-  Divider,
-  Grid,
-  Group,
-  Paper,
-  Stack,
-  Text,
-  Title
-} from "@mantine/core";
+import { Divider, Grid, Group, Paper, Stack, Text, Title } from "@mantine/core";
 
-
-export default function AdminMain({countUser, countPorto}: {countUser: number, countPorto: number} ) {
+export default function AdminMain({
+  countUser,
+  countPorto,
+}: {
+  countUser: number;
+  countPorto: number;
+}) {
   const listBox = [
     {
       id: 1,
@@ -34,21 +31,11 @@ export default function AdminMain({countUser, countPorto}: {countUser: number, c
       <Stack spacing={"sm"}>
         <Title>Main Dashboard</Title>
         <Divider mb={"md"} />
-        {/* <Stack align="center" justify="center" h={"80vh"}>
-          <Title>Cooming Soon !!</Title>
-        </Stack> */}
 
         <Grid>
           {listBox.map((e) => (
             <Grid.Col md={4} lg={4} key={e.id}>
-              <Paper
-                withBorder
-                // bg={`${e.color}.2`}
-                shadow="md"
-                radius="md"
-                p="md"
-                //   sx={{ borderColor: e.color, borderStyle: "solid" }}
-              >
+              <Paper withBorder shadow="md" radius="md" p="md">
                 <Group position="center">
                   <Stack align="center" spacing={0}>
                     <Text>{e.name}</Text>
@@ -67,41 +54,3 @@ export default function AdminMain({countUser, countPorto}: {countUser: number, c
     </>
   );
 }
-
-// const PieChart = () => {
-//   const option: echarts.EChartsOption = {
-//     title: {},
-//     tooltip: {
-//       trigger: "item",
-//     },
-//     legend: {
-//       top: "bottom",
-//     },
-//     series: [
-//       {
-//         name: "Anggota Partai",
-//         type: "pie",
-//         bottom: "40",
-//         data: [
-//           { value: 10, name: "Laki-Laki" },
-//           { value: 20, name: "Perempuan" },
-//         ],
-//       },
-//     ],
-//   };
-
-//   return (
-//     <>
-//       <Box
-//         sx={{
-//           backgroundColor: "gray",
-//         }}
-//       >
-//         <Text ta={"center"} fz={20} fw={700}>
-//           Jenis Kelamin
-//         </Text>
-//         <EChartsReact style={{ height: 300 }} option={option} />
-//       </Box>
-//     </>
-//   );
-// };

src/app_modules/auth/login/view.tsx

@@ -32,7 +32,8 @@ export default function Login({ version }: { version: string }) {
     if (res.status === 200) {
       setLoading(true);
       ComponentGlobal_NotifikasiBerhasil(res.message, 2000);
-      router.push(RouterAuth.validasi + res.kodeId, { scroll: false });
+      // router.push(RouterAuth.validasi + res.kodeId, { scroll: false });
+      router.push("/validasi/" + res.kodeId, { scroll: false });
     } else {
       ComponentGlobal_NotifikasiPeringatan(res.message);
     }

src/app_modules/auth/logout/view.tsx

@@ -20,7 +20,7 @@ export default function Component_Logout() {
     const res = await auth_Logout();
     if (res.status === 200) {
       ComponentGlobal_NotifikasiBerhasil(res.message);
-      router.push(RouterAuth.login, { scroll: false });
+      router.push("/login", { scroll: false });
     } else {
       ComponentGlobal_NotifikasiPeringatan(res.message);
     }

src/app_modules/auth/splash/view.tsx

@@ -1,26 +1,56 @@
 "use client";
 
+import { RouterAdminDashboard } from "@/app/lib/router_hipmi/router_admin";
 import { RouterAuth } from "@/app/lib/router_hipmi/router_auth";
 import { RouterHome } from "@/app/lib/router_hipmi/router_home";
+import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
+import { funGlobal_getUserById } from "@/app_modules/_global/fun/get/fun_get_user_by_id";
+import { MODEL_USER } from "@/app_modules/home/model/interface";
 import { Avatar, BackgroundImage, Center, Image, Stack } from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
 import { useRouter } from "next/navigation";
 
-export default function SplashScreen({ userLoginId }: { userLoginId: any }) {
+export default function SplashScreen({
+  checkCookies,
+}: {
+  checkCookies: boolean;
+}) {
   const router = useRouter();
 
   useShallowEffect(() => {
-    if (!userLoginId) {
-      setTimeout(() => {
-        return router.push(RouterAuth.login, { scroll: false });
-      }, 1000);
-    } else {
-      setTimeout(() => {
-        return router.push(RouterHome.main_home, { scroll: false });
-      }, 1000);
-    }
+    // if (!checkCookies) return router.push(RouterAuth.login, { scroll: false });
+    // onCheckUser();
+
+    // setTimeout(() => {
+    //   router.push(RouterAuth.login, { scroll: false });
+    // }, 1000);
+    // if (!userLoginId) {
+    //   setTimeout(() => {
+    //     router.push(RouterAuth.login, { scroll: false });
+    //   }, 1000);
+    // } else {
+    //   dataUser.masterUserRoleId === "1"
+    //     ? setTimeout(() => {
+    //         return router.push(RouterHome.main_home, { scroll: false });
+    //       }, 1000)
+    //     : setTimeout(() => {
+    //         return router.push(RouterAdminDashboard.splash_admin, {
+    //           scroll: false,
+    //         });
+    //       }, 1000);
+    // }
   }, []);
 
+  // async function onCheckUser() {
+  //   const userLoginId = await funGetUserIdByToken();
+  //   const dataUser = await funGlobal_getUserById({ userId: userLoginId });
+
+  //   if (dataUser?.masterUserRoleId == "1")
+  //     return router.push(RouterHome.main_home);
+
+  //   return router.push(RouterAdminDashboard.splash_admin);
+  // }
+
   return (
     <>
       <BackgroundImage

src/app_modules/check_cookies/layout_cek_cookies.tsx

@@ -3,27 +3,40 @@
 import { RouterAuth } from "@/app/lib/router_hipmi/router_auth";
 import { useShallowEffect } from "@mantine/hooks";
 import { useRouter } from "next/navigation";
+import { MODEL_USER } from "../home/model/interface";
+import { RouterHome } from "@/app/lib/router_hipmi/router_home";
+import { RouterAdminDashboard } from "@/app/lib/router_hipmi/router_admin";
 
 export function CheckCookies_UiLayout({
   children,
+  dataUser,
 }: {
   children: React.ReactNode;
+  dataUser: MODEL_USER;
 }) {
   const router = useRouter();
 
-  useShallowEffect(() => {
-    onCheckCookies();
-  }, []);
+  // useShallowEffect(() => {
+  //   onCheckCookies();
+  // }, []);
 
-  async function onCheckCookies() {
-    const cek = await fetch("/api/check-cookies");
+  // async function onCheckCookies() {
+  //   const cek = await fetch("/api/check-cookies");
 
-    const result = await cek.json();
+  //   const result = await cek.json();
 
-    if (result.success === false) {
-      router.push(RouterAuth.login, { scroll: false });
-    }
-  }
+  //   if (result.success === false) {
+  //     router.push(RouterAuth.login, { scroll: false });
+  //   }
+  // }
+
+  // if (dataUser.masterUserRoleId === "1") {
+  //   router.push(RouterHome.main_home, { scroll: false });
+  // }
+
+  // if (dataUser.masterUserRoleId !== "1") {
+  //   router.push(RouterAdminDashboard.splash_admin, { scroll: false });
+  // }
 
   return children;
 }

src/app_modules/donasi/create/create_cerita_penggalang.tsx

@@ -31,6 +31,8 @@ import { useState } from "react";
 import { Donasi_funCreate } from "../fun/create/fun_create_donasi";
 import { gs_donasi_hot_menu, gs_donasi_tabs_posting } from "../global_state";
 import { MODEL_DONASI_TEMPORARY } from "../model/interface";
+import { IRealtimeData } from "@/app/lib/global_state";
+import { WibuRealtime } from "wibu-pkg";
 
 export default function CreateCeritaPenggalangDonasi({
   dataTemporary,
@@ -90,7 +92,16 @@ export default function CreateCeritaPenggalangDonasi({
       });
 
       if (res.status === 201) {
-        const dataNotif: any = {
+        // const dataNotif: any = {
+        //   appId: res.data?.id as any,
+        //   status: res.data?.DonasiMaster_Status?.name as any,
+        //   userId: res.data?.authorId as any,
+        //   pesan: res.data?.title as any,
+        //   kategoriApp: "DONASI",
+        //   title: "Donasi baru",
+        // };
+
+        const dataNotifikasi: IRealtimeData = {
           appId: res.data?.id as any,
           status: res.data?.DonasiMaster_Status?.name as any,
           userId: res.data?.authorId as any,
@@ -100,16 +111,25 @@ export default function CreateCeritaPenggalangDonasi({
         };
 
         const notif = await notifikasiToAdmin_funCreate({
-          data: dataNotif as any,
+          data: dataNotifikasi as any,
         });
 
         if (notif.status === 201) {
-          mqtt_client.publish(
-            "ADMIN",
-            JSON.stringify({
-              count: 1,
-            })
-          );
+          // mqtt_client.publish(
+          //   "ADMIN",
+          //   JSON.stringify({
+          //     count: 1,
+          //   })
+          // );
+
+          WibuRealtime.setData({
+            type: "notification",
+            pushNotificationTo: "ADMIN",
+          });
+
+          
+
+
           setDonasiHotMenu(1);
           ComponentGlobal_NotifikasiBerhasil(res.message);
           router.push(RouterDonasi.status_galang_dana({ id: "2" }), {

src/app_modules/fun_global/get_user_token.ts

@@ -5,14 +5,14 @@ import { ServerEnv } from "@/app/lib/server_env";
 import { unsealData } from "iron-session";
 import _ from "lodash";
 import { cookies } from "next/headers";
-import { redirect } from "next/navigation";
+
 
 export async function user_funGetOneUserId(): Promise<string | null> {
   try {
     const kukis = cookies();
     const c = kukis.get("mySession");
-    if (!c || !c?.value || _.isEmpty(c?.value) || _.isUndefined(c?.value))
-      return redirect(RouterAuth.login);
+    // if (!c || !c?.value || _.isEmpty(c?.value) || _.isUndefined(c?.value))
+    //   return re-di-re-ct(RouterAuth.login);
 
     const token = JSON.parse(
       await unsealData(c?.value as string, {

src/app_modules/home/view_home.tsx

@@ -49,6 +49,8 @@ export default function HomeView({
     onLoad(loadNotif);
   }
 
+  // console.log(dataUser, "dipage")
+
   return (
     <>
       <UIGlobal_LayoutTamplate

src/app_modules/job/component/button/comp_button_save_create.tsx

@@ -19,6 +19,7 @@ import { WibuRealtime } from "wibu-pkg";
 import { job_funCreateNoFile, job_funCreateWithFile } from "../../fun";
 import { gs_job_hot_menu } from "../../global_state";
 import { MODEL_JOB } from "../../model/interface";
+import { envs } from "@/lib/envs";
 
 function Job_ComponentButtonSaveCreate({
   value,