Fix: Event

Deksripsi
- Fix notifikasi
- Fix load beranda
- Fix reload button di admin
This commit is contained in:
2024-11-15 17:34:06 +08:00
parent afe7040d0e
commit 1f8bfcbed9
48 changed files with 1845 additions and 1241 deletions

View File

@@ -6,20 +6,18 @@ import adminNotifikasi_getByUserId from "@/app_modules/admin/notifikasi/fun/get/
import React from "react";
import versionUpdate from "../../../../package.json";
export default async function Layout({
children,
}: {
children: React.ReactNode;
}) {
const userLoginId = await funGetUserIdByToken();
const version = versionUpdate.version
const version = versionUpdate.version;
const dataUser = await funGlobal_getUserById({ userId: userLoginId });
const listNotifikasi = await adminNotifikasi_getByUserId();
const listNotifikasi = await adminNotifikasi_getByUserId({page: 1});
const countNotifikasi = await adminNotifikasi_countNotifikasi();
return (
<>
{/* <AdminLayout

View File

@@ -2,7 +2,7 @@ import { Event_DetailDraft } from "@/app_modules/event";
import { event_getOneById } from "@/app_modules/event/fun/get/get_one_by_id";
export default async function Page({ params }: { params: { id: string } }) {
let eventId = params.id;
const eventId = params.id;
const dataEvent = await event_getOneById(eventId);
return (
<Event_DetailDraft eventId={eventId as any} dataEvent={dataEvent as any} />

View File

@@ -1,5 +1,4 @@
import { LayoutEvent_DetailMain } from "@/app_modules/event";
import { AppShell } from "@mantine/core";
import React from "react";
export default async function Layout({

View File

@@ -1,7 +1,9 @@
import { atom } from "jotai";
import { atomWithStorage } from "jotai/utils";
export type IRealtimeData = {
status?: "Publish" | "Review" | "Draft" | "Reject";
status?: "Publish" | "Review" | "Draft" | "Reject" | "Peserta Event";
appId: string;
userId: string;
pesan: string;
@@ -14,14 +16,18 @@ export type IRealtimeData = {
| "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);
export const gs_count_ntf = atom<number>(0);
// job
export const gs_adminJobTriggerReview = atom<boolean>(false);
export const gs_jobTiggerBeranda = atom<boolean>(false);
export const gs_job_trigger = atom<boolean>(false)
// event
export const gs_adminEventTriggerReview = atom<boolean>(false);
export const gs_eventTriggerBeranda = atom<boolean>(false);

View File

@@ -5,7 +5,10 @@ import { useAtom } from "jotai";
import { WibuRealtime } from "wibu-pkg";
import {
gs_admin_ntf,
gs_job_trigger,
gs_adminEventTriggerReview,
gs_adminJobTriggerReview,
gs_eventTriggerBeranda,
gs_jobTiggerBeranda,
gs_realtimeData,
gs_user_ntf,
IRealtimeData,
@@ -27,7 +30,21 @@ export default function RealtimeProvider({
const [dataRealtime, setDataRealtime] = useAtom(gs_realtimeData);
const [newAdminNtf, setNewAdminNtf] = useAtom(gs_admin_ntf);
const [newUserNtf, setNewUserNtf] = useAtom(gs_user_ntf);
const [triggerJob, setTriggerJob] = useAtom(gs_job_trigger);
// JOB
const [isTriggerJobBeranda, setIsTriggerJobBeranda] =
useAtom(gs_jobTiggerBeranda);
const [isAdminJob_TriggerReview, setIsAdminJob_TriggerReview] = useAtom(
gs_adminJobTriggerReview
);
// EVENT
const [isTriggerEventBeranda, setIsTriggerEventBeranca] = useAtom(
gs_eventTriggerBeranda
);
const [isAdminEvent_TriggerReview, setIsAdminEvent_TriggerReview] = useAtom(
gs_adminEventTriggerReview
);
useShallowEffect(() => {
WibuRealtime.init({
@@ -36,6 +53,7 @@ export default function RealtimeProvider({
setNewAdminNtf((e) => e + 1);
}
// Notifikasi ke semua user , yang datanya di acc admin
if (
data.type == "notification" &&
data.pushNotificationTo == "USER" &&
@@ -45,14 +63,52 @@ export default function RealtimeProvider({
setDataRealtime(data.dataMessage as any);
}
// JOB
if (
data.type == "trigger" &&
data.pushNotificationTo == "ADMIN" &&
data.dataMessage?.kategoriApp == "JOB"
) {
setIsAdminJob_TriggerReview(true);
}
if (
data.type == "trigger" &&
data.pushNotificationTo == "USER" &&
data.dataMessage?.kategoriApp == "JOB"
data.dataMessage?.kategoriApp == "JOB" &&
data.dataMessage.status == "Publish"
) {
setTriggerJob(true);
setIsTriggerJobBeranda(true);
}
// EVENT
if (
data.type == "trigger" &&
data.pushNotificationTo == "ADMIN" &&
data.dataMessage?.kategoriApp == "EVENT"
) {
setIsAdminEvent_TriggerReview(true);
}
if (
data.type == "trigger" &&
data.pushNotificationTo == "USER" &&
data.dataMessage?.kategoriApp == "EVENT" &&
data.dataMessage.status == "Publish"
) {
setIsTriggerEventBeranca(true);
}
if (
data.type == "notification" &&
data.pushNotificationTo == "USER" &&
data.dataMessage?.status == "Peserta Event" &&
userLoginId !== data.dataMessage?.userId
) {
setNewUserNtf((e) => e + 1);
}
},
project: "hipmi",
WIBU_REALTIME_TOKEN: WIBU_REALTIME_TOKEN,
});

View File

@@ -30,7 +30,6 @@ export default function Page() {
pesan: "apa kabar",
title: "coba",
kategoriApp: "INVESTASI",
userRole: "ADMIN",
};
WibuRealtime.setData({

View File

@@ -25,7 +25,6 @@ export default function Page() {
pesan: "apa kabar",
title: "coba",
kategoriApp: "INVESTASI",
userRole: "USER",
};
WibuRealtime.setData({