Deskripsi:
- Fix notifikasi admi to user
- Fix count notifikasi di admin dan user
## No Issue
This commit is contained in:
2024-11-11 17:02:42 +08:00
parent a6548f7b36
commit aa612d24bc
42 changed files with 1114 additions and 765 deletions

View File

@@ -13,9 +13,10 @@ export default async function Layout({
const userLoginId = await funGetUserIdByToken();
const dataUser = await funGlobal_getUserById({ userId: userLoginId });
const listNotif = await adminNotifikasi_getByUserId();
const listNotifikasi = await adminNotifikasi_getByUserId();
const countNotifikasi = await adminNotifikasi_countNotifikasi();
return (
<>
{/* <AdminLayout
@@ -25,7 +26,13 @@ export default async function Layout({
>
{children}
</AdminLayout> */}
<Admin_NewLayout user={dataUser as any}>{children}</Admin_NewLayout>
<Admin_NewLayout
user={dataUser as any}
countNotifikasi={countNotifikasi as any}
listNotifikasi={listNotifikasi as []}
>
{children}
</Admin_NewLayout>
</>
);
}

View File

@@ -4,6 +4,7 @@ import "./globals.css";
import { TokenProvider } from "./lib/token";
import dotenv from "dotenv";
import { ServerEnv } from "./lib/server_env";
import { RealtimeProvider } from "./lib";
dotenv.config({
path: ".env",
});
@@ -45,6 +46,7 @@ export default function RootLayout({
<RootStyleRegistry>
<MqttLoader />
<TokenProvider token={token} envObject={envObject} />
<RealtimeProvider />
{children}
</RootStyleRegistry>
);

View File

@@ -0,0 +1,23 @@
import { atom } from "jotai";
export type IRealtimeData = {
status?: "Publish" | "Review" | "Draft" | "Reject";
appId: string;
userId: string;
pesan: string;
title: string;
kategoriApp:
| "JOB"
| "VOTING"
| "EVENT"
| "DONASI"
| "INVESTASI"
| "COLLABORATION"
| "FORUM";
userRole?: "USER" | "ADMIN";
};
export const gs_realtimeData = atom<IRealtimeData | null>(null);
export const gs_admin_ntf = atom<number>(0);
export const gs_user_ntf = atom<number>(0);

View File

@@ -4,11 +4,13 @@ import prisma from "./prisma";
import { pathAssetImage } from "./path_asset_image";
import { RouterImagePreview } from "./router_hipmi/router_image_preview";
import { RouterAdminGlobal } from "./router_admin/router_admin_global";
import RealtimeProvider from "./realtime_provider";
export { DIRECTORY_ID };
export { prisma };
export { APIs };
export { pathAssetImage };
export { RealtimeProvider };
// Router
export { RouterImagePreview };

View File

@@ -0,0 +1,49 @@
"use client";
import { useShallowEffect } from "@mantine/hooks";
import { useAtom } from "jotai";
import { WibuRealtime } from "wibu-pkg";
import {
gs_admin_ntf,
gs_realtimeData,
gs_user_ntf,
IRealtimeData,
} from "./global_state";
export type TypeNotification = {
type: "message" | "notification"
pushNotificationTo: "ADMIN" | "USER";
dataMessage?: IRealtimeData;
userLoginId?: string;
};
const WIBU_REALTIME_TOKEN: any = process.env.NEXT_PUBLIC_WIBU_REALTIME_TOKEN;
export default function RealtimeProvider() {
const [dataRealtime, setDataRealtime] = useAtom(gs_realtimeData);
const [newAdminNtf, setNewAdminNtf] = useAtom(gs_admin_ntf);
const [newUserNtf, setNewUserNtf] = useAtom(gs_user_ntf);
useShallowEffect(() => {
WibuRealtime.init({
onData(data: TypeNotification) {
if (data.type == "notification" && data.pushNotificationTo == "ADMIN") {
setNewAdminNtf((e) => e + 1);
}
if (data.type == "notification" && data.pushNotificationTo == "USER") {
setNewUserNtf((e) => e + 1);
setDataRealtime(data.dataMessage as any);
}
if (data.type == "message") {
// console.log(data.dataMessage);
setDataRealtime(data.dataMessage as any);
}
},
project: "hipmi",
WIBU_REALTIME_TOKEN: WIBU_REALTIME_TOKEN,
});
}, []);
return null;
}

View File

@@ -0,0 +1,55 @@
"use client";
import {
gs_admin_ntf,
gs_realtimeData,
IRealtimeData,
} from "@/app/lib/global_state";
import { Button, Stack } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import { useAtom } from "jotai";
import { WibuRealtime } from "wibu-pkg";
import { v4 } from "uuid";
import { useState } from "react";
const angka = 10;
export default function Page() {
const [dataRealtime, setDataRealtime] = useAtom(gs_realtimeData);
const [adminNtf, setAdminNtf] = useAtom(gs_admin_ntf);
const [notif, setNotif] = useState(angka);
useShallowEffect(() => {
if (adminNtf) {
setNotif((e) => e + 1);
}
}, [adminNtf]);
async function onSend() {
const newData: IRealtimeData = {
appId: v4(),
status: "Publish",
userId: "user1",
pesan: "apa kabar",
title: "coba",
kategoriApp: "INVESTASI",
userRole: "ADMIN",
};
WibuRealtime.setData({
type: "message",
pushNotificationTo: "USER",
dataMessage: newData,
});
}
return (
<Stack p={"md"} align="center" justify="center" h={"80vh"}>
{notif}
<Button
onClick={() => {
onSend();
}}
>
Dari test 1
</Button>
</Stack>
);
}

View File

@@ -0,0 +1,48 @@
"use client";
import { gs_realtimeData, IRealtimeData } from "@/app/lib/global_state";
import { Button, Stack } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import { useAtom } from "jotai";
import { WibuRealtime } from "wibu-pkg";
import { v4 } from "uuid";
export default function Page() {
const [dataRealtime, setDataRealtime] = useAtom(gs_realtimeData);
useShallowEffect(() => {
console.log(
dataRealtime?.userId == "user2"
? console.log("")
: console.log(dataRealtime)
);
}, [dataRealtime]);
async function onSend() {
const newData: IRealtimeData = {
appId: v4(),
status: "Publish",
userId: "user2",
pesan: "apa kabar",
title: "coba",
kategoriApp: "INVESTASI",
userRole: "USER",
};
WibuRealtime.setData({
type: "notification",
pushNotificationTo: "ADMIN",
});
}
return (
<Stack p={"md"} align="center" justify="center" h={"80vh"}>
<Button
onClick={() => {
onSend();
}}
>
Dari test 2 cuma notif
</Button>
</Stack>
);
}

View File

@@ -1,13 +1,14 @@
"use client";
import { useShallowEffect } from "@mantine/hooks";
import { useState } from "react";
import { useHookstate } from "@hookstate/core";
import { Button, Stack } from "@mantine/core";
export default function Page() {
const [origin, setOrigin] = useState("");
useShallowEffect(() => {
if (typeof window !== "undefined") {
setOrigin(window.location.origin);
}
}, []);
return <div>{origin}</div>;
return (
<Stack>
<Button onClick={() => {}}>tekan</Button>
</Stack>
);
}