diff --git a/src/app/dev/event/main/status_page/page.tsx b/src/app/dev/event/main/status_page/page.tsx
index 1aade7b4..792bfdbc 100644
--- a/src/app/dev/event/main/status_page/page.tsx
+++ b/src/app/dev/event/main/status_page/page.tsx
@@ -1,13 +1,13 @@
 import { Event_StatusPage } from "@/app_modules/event";
-import { Event_getByStatusId } from "@/app_modules/event/fun/get/get_event_by_status_id";
+import { Event_getListByStatusId } from "@/app_modules/event/fun/get/get_list_event_by_status_id";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 
 export default async function Page() {
   const authorId = await user_getOneUserId();
-  const listPublish = await Event_getByStatusId("1", authorId);
-  const listReview = await Event_getByStatusId("2", authorId);
-  const listDraft = await Event_getByStatusId("3", authorId);
-  const listReject = await Event_getByStatusId("4", authorId);
+  const listPublish = await Event_getListByStatusId("1", authorId);
+  const listReview = await Event_getListByStatusId("2", authorId);
+  const listDraft = await Event_getListByStatusId("3", authorId);
+  const listReject = await Event_getListByStatusId("4", authorId);
 
   return (
     <Event_StatusPage
diff --git a/src/app_modules/admin/event/child/riwayat.tsx b/src/app_modules/admin/event/child/riwayat.tsx
index 4e3f2997..6fce60ee 100644
--- a/src/app_modules/admin/event/child/riwayat.tsx
+++ b/src/app_modules/admin/event/child/riwayat.tsx
@@ -75,15 +75,15 @@ function DetailRiwayat({ listRiwayat }: { listRiwayat: MODEL_EVENT[] }) {
           Peserta
         </Button>
       </td>
-      <td>{e.title}</td>
-      <td>{e.lokasi}</td>
-      <td>{e.EventMaster_TipeAcara.name}</td>
-      <td>{e.tanggal.toLocaleString("id-ID", { dateStyle: "full" })}</td>
+      <td>{e?.Author?.Profile?.name}</td>
+      <td>{e?.title}</td>
+      <td>{e?.lokasi}</td>
+      <td>{e?.EventMaster_TipeAcara?.name}</td>
+      <td>{e?.tanggal.toLocaleString("id-ID", { dateStyle: "full" })}</td>
       <td>
         {e.tanggal.toLocaleTimeString([], {
           hour: "2-digit",
           minute: "2-digit",
-          hour12: false,
         })}
       </td>
       <td>
@@ -121,23 +121,24 @@ function DetailRiwayat({ listRiwayat }: { listRiwayat: MODEL_EVENT[] }) {
             <Stack>
               {peserta?.map((e) => (
                 <Stack key={e.id} spacing={"xs"}>
-                  <Grid >
-                  <Grid.Col span={"content"}>
-                    <Avatar
-                      sx={{ borderStyle: "solid", borderWidth: "0.5px" }}
-                      radius={"xl"}
-                      src={
-                        RouterProfile.api_foto_profile + e?.User?.Profile?.imagesId
-                      }
-                    />
-                  </Grid.Col>
-                  <Grid.Col span={"auto"}>
-                    <Group align="center" h={"100%"}>
-                      <Text>{e?.User?.Profile?.name}</Text>
-                    </Group>
-                  </Grid.Col>
-                </Grid>
-                <Divider/>
+                  <Grid>
+                    <Grid.Col span={"content"}>
+                      <Avatar
+                        sx={{ borderStyle: "solid", borderWidth: "0.5px" }}
+                        radius={"xl"}
+                        src={
+                          RouterProfile.api_foto_profile +
+                          e?.User?.Profile?.imagesId
+                        }
+                      />
+                    </Grid.Col>
+                    <Grid.Col span={"auto"}>
+                      <Group align="center" h={"100%"}>
+                        <Text>{e?.User?.Profile?.name}</Text>
+                      </Group>
+                    </Grid.Col>
+                  </Grid>
+                  <Divider />
                 </Stack>
               ))}
             </Stack>
@@ -164,6 +165,9 @@ function DetailRiwayat({ listRiwayat }: { listRiwayat: MODEL_EVENT[] }) {
               <th>
                 <Center>Aksi</Center>
               </th>
+              <th>
+                <Center>Author</Center>
+              </th>
               <th>
                 <Center>Judul</Center>
               </th>
diff --git a/src/app_modules/admin/event/main/index.tsx b/src/app_modules/admin/event/main/index.tsx
index e58afff2..680a3e74 100644
--- a/src/app_modules/admin/event/main/index.tsx
+++ b/src/app_modules/admin/event/main/index.tsx
@@ -50,13 +50,13 @@ export default function AdminEvent_Main({
       path: RouterAdminEvent.table_review,
       color: "orange",
     },
-    {
-      id: 3,
-      name: "Draft",
-      jumlah: countDraft,
-      path: "",
-      color: "yellow",
-    },
+    // {
+    //   id: 3,
+    //   name: "Draft",
+    //   jumlah: countDraft,
+    //   path: "",
+    //   color: "yellow",
+    // },
     {
       id: 4,
       name: "Reject",
diff --git a/src/app_modules/admin/event/table_status/table_publish.tsx b/src/app_modules/admin/event/table_status/table_publish.tsx
index 3e6985b5..646bbae7 100644
--- a/src/app_modules/admin/event/table_status/table_publish.tsx
+++ b/src/app_modules/admin/event/table_status/table_publish.tsx
@@ -72,15 +72,15 @@ function TableStatus({ listPublish }: { listPublish: MODEL_EVENT[] }) {
 
   const TableRows = data.map((e, i) => (
     <tr key={i}>
-      <td>{e.title}</td>
-      <td>{e.lokasi}</td>
-      <td>{e.EventMaster_TipeAcara.name}</td>
-      <td>{e.tanggal.toLocaleString("id-ID", { dateStyle: "full" })}</td>
+      <td>{e?.Author?.Profile?.name}</td>
+      <td>{e?.title}</td>
+      <td>{e?.lokasi}</td>
+      <td>{e?.EventMaster_TipeAcara?.name}</td>
+      <td>{e?.tanggal.toLocaleString("id-ID", { dateStyle: "full" })}</td>
       <td>
         {e.tanggal.toLocaleTimeString([], {
           hour: "2-digit",
           minute: "2-digit",
-          hour12: false,
         })}
       </td>
       <td>
@@ -121,28 +121,34 @@ function TableStatus({ listPublish }: { listPublish: MODEL_EVENT[] }) {
               <Title order={3}>Daftar Peserta</Title>
             </Center>
             <Stack>
-              {peserta?.map((e) => (
-                <Stack key={e.id} spacing={"xs"}>
-                  <Grid>
-                    <Grid.Col span={"content"}>
-                      <Avatar
-                        sx={{ borderStyle: "solid", borderWidth: "0.5px" }}
-                        radius={"xl"}
-                        src={
-                          RouterProfile.api_foto_profile +
-                          e?.User?.Profile?.imagesId
-                        }
-                      />
-                    </Grid.Col>
-                    <Grid.Col span={"auto"}>
-                      <Group align="center" h={"100%"}>
-                        <Text>{e?.User?.Profile?.name}</Text>
-                      </Group>
-                    </Grid.Col>
-                  </Grid>
-                  <Divider />
-                </Stack>
-              ))}
+              {_.isEmpty(peserta) ? (
+                <Center>
+                  <Text c={"gray"}>Tidak ada peserta</Text>
+                </Center>
+              ) : (
+                peserta?.map((e) => (
+                  <Stack key={e.id} spacing={"xs"}>
+                    <Grid>
+                      <Grid.Col span={"content"}>
+                        <Avatar
+                          sx={{ borderStyle: "solid", borderWidth: "0.5px" }}
+                          radius={"xl"}
+                          src={
+                            RouterProfile.api_foto_profile +
+                            e?.User?.Profile?.imagesId
+                          }
+                        />
+                      </Grid.Col>
+                      <Grid.Col span={"auto"}>
+                        <Group align="center" h={"100%"}>
+                          <Text>{e?.User?.Profile?.name}</Text>
+                        </Group>
+                      </Grid.Col>
+                    </Grid>
+                    <Divider />
+                  </Stack>
+                ))
+              )}
             </Stack>
           </Stack>
         </Paper>
@@ -163,6 +169,7 @@ function TableStatus({ listPublish }: { listPublish: MODEL_EVENT[] }) {
         >
           <thead>
             <tr>
+              <th>Author</th>
               <th>Judul</th>
               <th>Lokasi</th>
               <th>Tipe Acara</th>
diff --git a/src/app_modules/admin/event/table_status/table_reject.tsx b/src/app_modules/admin/event/table_status/table_reject.tsx
index e9920a7c..99471bc8 100644
--- a/src/app_modules/admin/event/table_status/table_reject.tsx
+++ b/src/app_modules/admin/event/table_status/table_reject.tsx
@@ -90,7 +90,6 @@ function TableStatus({ listReject }: { listReject: MODEL_EVENT[] }) {
           {e.tanggal.toLocaleTimeString([], {
             hour: "2-digit",
             minute: "2-digit",
-            hour12: false,
           })}
         </Box>
       </td>
diff --git a/src/app_modules/admin/event/table_status/table_review.tsx b/src/app_modules/admin/event/table_status/table_review.tsx
index fe4430bf..a3fe6ebc 100644
--- a/src/app_modules/admin/event/table_status/table_review.tsx
+++ b/src/app_modules/admin/event/table_status/table_review.tsx
@@ -75,7 +75,6 @@ function TableStatus({ listReview }: { listReview: MODEL_EVENT[] }) {
         {e.tanggal.toLocaleTimeString([], {
           hour: "2-digit",
           minute: "2-digit",
-          hour12: false,
         })}
       </td>
       <td>
@@ -90,7 +89,7 @@ function TableStatus({ listReview }: { listReview: MODEL_EVENT[] }) {
             color={"green"}
             leftIcon={<IconEyeShare />}
             radius={"xl"}
-            onClick={() => onPublish(e.id, setData)}
+            onClick={() => onPublish(e.id, setData, e.tanggal)}
           >
             Publish
           </Button>
@@ -194,7 +193,12 @@ function TableStatus({ listReview }: { listReview: MODEL_EVENT[] }) {
   );
 }
 
-async function onPublish(eventId: string, setData: any) {
+async function onPublish(eventId: string, setData: any, tanggal: Date) {
+  if (moment(tanggal).diff(Date.now(), "minutes") < 0)
+    return ComponentGlobal_NotifikasiPeringatan(
+      "Waktu acara telah lewat, Report untuk memberitahu user !"
+    );
+
   await AdminEvent_funEditStatusPublishById(eventId, "1").then(async (res) => {
     if (res.status === 200) {
       await AdminEvent_getListTableByStatusId("2").then((res) => {
diff --git a/src/app_modules/event/component/box_list_status.tsx b/src/app_modules/event/component/box_list_status.tsx
index a53c04d7..a3266584 100644
--- a/src/app_modules/event/component/box_list_status.tsx
+++ b/src/app_modules/event/component/box_list_status.tsx
@@ -1,10 +1,12 @@
 "use client";
 
 import { RouterEvent } from "@/app/lib/router_hipmi/router_event";
-import { Paper, Stack, Group, Title, Text, Grid } from "@mantine/core";
+import { Paper, Stack, Group, Title, Text, Grid, Card } from "@mantine/core";
 import moment from "moment";
 import { MODEL_EVENT } from "../model/interface";
 import { useRouter } from "next/navigation";
+import { useState } from "react";
+import ComponentGlobal_CardLoadingOverlay from "@/app_modules/component_global/loading_card";
 
 export default function ComponentEvent_BoxListStatus({
   data,
@@ -14,15 +16,22 @@ export default function ComponentEvent_BoxListStatus({
   path: string;
 }) {
   const router = useRouter();
+  const [eventId, setEventId] = useState("");
+  const [visible, setVisible] = useState(false);
+
   return (
     <>
-      <Paper
+      <Card
         shadow="lg"
         radius={"md"}
         p={"md"}
         withBorder
         mb={"sm"}
-        onClick={() => router.push(path + data.id)}
+        onClick={() => {
+          setEventId(data?.id);
+          setVisible(true);
+          router.push(path + data.id);
+        }}
       >
         <Stack>
           <Grid>
@@ -42,7 +51,12 @@ export default function ComponentEvent_BoxListStatus({
             {data.deskripsi}
           </Text>
         </Stack>
-      </Paper>
+        {visible && eventId !== "" ? (
+          <ComponentGlobal_CardLoadingOverlay />
+        ) : (
+          ""
+        )}
+      </Card>
     </>
   );
 }
diff --git a/src/app_modules/event/component/detail/detail_main.tsx b/src/app_modules/event/component/detail/detail_main.tsx
index 08d49828..004c8ac9 100644
--- a/src/app_modules/event/component/detail/detail_main.tsx
+++ b/src/app_modules/event/component/detail/detail_main.tsx
@@ -16,74 +16,73 @@ export default function ComponentEvent_DetailMainData({
   const jam = tgl.toLocaleTimeString([], {
     hour: "2-digit",
     minute: "2-digit",
-    hour12: false,
   });
 
   return (
     <>
       <Paper withBorder p={"md"} shadow="lg">
-       <Stack>
-       <ComponentGlobal_AuthorNameOnHeader
-          authorName={data.Author.Profile.name}
-          imagesId={data.Author.Profile.imagesId}
-          profileId={data.Author.Profile.id}
-        />
-        <Stack px={"sm"}>
-          <Title order={4}>{data ? data.title : null}</Title>
-          <Grid>
-            <Grid.Col span={4}>
+        <Stack>
+          <ComponentGlobal_AuthorNameOnHeader
+            authorName={data.Author.Profile.name}
+            imagesId={data.Author.Profile.imagesId}
+            profileId={data.Author.Profile.id}
+          />
+          <Stack px={"sm"}>
+            <Title order={4}>{data ? data.title : null}</Title>
+            <Grid>
+              <Grid.Col span={4}>
+                <Text fw={"bold"} fz={"sm"}>
+                  Lokasi
+                </Text>
+              </Grid.Col>
+              <Grid.Col span={1}>:</Grid.Col>
+              <Grid.Col span={"auto"}>
+                <Text>{data ? data.lokasi : null}</Text>
+              </Grid.Col>
+            </Grid>
+            <Grid>
+              <Grid.Col span={4}>
+                <Text fw={"bold"} fz={"sm"}>
+                  Tipe Acara
+                </Text>
+              </Grid.Col>
+              <Grid.Col span={1}>:</Grid.Col>
+              <Grid.Col span={"auto"}>
+                <Text>{data ? data.EventMaster_TipeAcara.name : null}</Text>
+              </Grid.Col>
+            </Grid>
+            <Grid>
+              <Grid.Col span={4}>
+                <Text fw={"bold"} fz={"sm"}>
+                  Tanggal
+                </Text>
+              </Grid.Col>
+              <Grid.Col span={1}>:</Grid.Col>
+              <Grid.Col span={"auto"}>{hari}</Grid.Col>
+            </Grid>
+            <Grid>
+              <Grid.Col span={4}>
+                <Text fw={"bold"} fz={"sm"}>
+                  Jam
+                </Text>
+              </Grid.Col>
+              <Grid.Col span={1}>:</Grid.Col>
+              <Grid.Col span={"auto"}>{jam}</Grid.Col>
+            </Grid>
+            <Stack spacing={2}>
               <Text fw={"bold"} fz={"sm"}>
-                Lokasi
+                Deskripsi
               </Text>
-            </Grid.Col>
-            <Grid.Col span={1}>:</Grid.Col>
-            <Grid.Col span={"auto"}>
-              <Text>{data ? data.lokasi : null}</Text>
-            </Grid.Col>
-          </Grid>
-          <Grid>
-            <Grid.Col span={4}>
-              <Text fw={"bold"} fz={"sm"}>
-                Tipe Acara
-              </Text>
-            </Grid.Col>
-            <Grid.Col span={1}>:</Grid.Col>
-            <Grid.Col span={"auto"}>
-              <Text>{data ? data.EventMaster_TipeAcara.name : null}</Text>
-            </Grid.Col>
-          </Grid>
-          <Grid>
-            <Grid.Col span={4}>
-              <Text fw={"bold"} fz={"sm"}>
-                Tanggal
-              </Text>
-            </Grid.Col>
-            <Grid.Col span={1}>:</Grid.Col>
-            <Grid.Col span={"auto"}>{hari}</Grid.Col>
-          </Grid>
-          <Grid>
-            <Grid.Col span={4}>
-              <Text fw={"bold"} fz={"sm"}>
-                Jam
-              </Text>
-            </Grid.Col>
-            <Grid.Col span={1}>:</Grid.Col>
-            <Grid.Col span={"auto"}>{jam}</Grid.Col>
-          </Grid>
-          <Stack spacing={2}>
-            <Text fw={"bold"} fz={"sm"}>
-              Deskripsi
-            </Text>
-            <Spoiler
-              hideLabel="Lihat sedikit"
-              maxHeight={50}
-              showLabel="Lihat banyak"
-            >
-              {data ? data.deskripsi : null}
-            </Spoiler>
+              <Spoiler
+                hideLabel="Lihat sedikit"
+                maxHeight={50}
+                showLabel="Lihat banyak"
+              >
+                {data ? data.deskripsi : null}
+              </Spoiler>
+            </Stack>
           </Stack>
         </Stack>
-       </Stack>
       </Paper>
     </>
   );
diff --git a/src/app_modules/event/create/create.tsx b/src/app_modules/event/create/create.tsx
index 13d82d53..aa1008c5 100644
--- a/src/app_modules/event/create/create.tsx
+++ b/src/app_modules/event/create/create.tsx
@@ -36,6 +36,7 @@ import toast from "react-simple-toasts";
 import moment from "moment";
 import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/component_global/notif_global/notifikasi_peringatan";
 import ComponentEvent_ErrorMaximalInput from "../component/error_maksimal_input";
+import ComponentGlobal_InputCountDown from "@/app_modules/component_global/input_countdown";
 
 export default function Event_Create({
   listTipeAcara,
@@ -69,13 +70,6 @@ export default function Event_Create({
           placeholder="Masukan judul"
           withAsterisk
           maxLength={100}
-          error={
-            value.title.length >= 100 ? (
-              <ComponentEvent_ErrorMaximalInput max={100} />
-            ) : (
-              ""
-            )
-          }
           onChange={(val) => {
             setValue({
               ...value,
@@ -104,13 +98,6 @@ export default function Event_Create({
           placeholder="Masukan lokasi acara"
           withAsterisk
           maxLength={100}
-          error={
-            value.lokasi.length >= 100 ? (
-              <ComponentEvent_ErrorMaximalInput max={100} />
-            ) : (
-              ""
-            )
-          }
           onChange={(val) => {
             setValue({
               ...value,
@@ -146,33 +133,38 @@ export default function Event_Create({
             });
           }}
         />
-        <Textarea
-          label="Deskripsi"
-          placeholder="Deskripsikan acara yang akan di selenggarakan"
-          withAsterisk
-          autosize
-          maxLength={200}
-          error={
-            value.deskripsi.length >= 200 ? (
-              <ComponentEvent_ErrorMaximalInput max={200} />
-            ) : (
-              ""
-            )
-          }
-          onChange={(val) => {
-            setValue({
-              ...value,
-              deskripsi: val.target.value,
-            });
-          }}
-        />
+
+        <Stack spacing={5}>
+          <Textarea
+            label="Deskripsi"
+            placeholder="Deskripsikan acara yang akan di selenggarakan"
+            withAsterisk
+            autosize
+            maxLength={300}
+            onChange={(val) => {
+              setValue({
+                ...value,
+                deskripsi: val.target.value,
+              });
+            }}
+          />
+          <ComponentGlobal_InputCountDown
+            lengthInput={value.deskripsi.length}
+            maxInput={300}
+          />
+        </Stack>
+
         <Button
+          style={{
+            transition: "0.5s",
+          }}
           disabled={
             value.title === "" ||
             value.lokasi === "" ||
             value.deskripsi === "" ||
             value.eventMaster_TipeAcaraId === 0 ||
-            value.tanggal === "function Date() { [native code] }"
+            value.tanggal === "function Date() { [native code] }" ||
+            moment(value.tanggal).diff(moment(), "minutes") < 0
           }
           loaderPosition="center"
           loading={isLoading ? true : false}
@@ -196,20 +188,16 @@ async function onSave(
   setHotMenu: any,
   setLoading: any
 ) {
-  if (_.values(value).includes(""))
-    return ComponentGlobal_NotifikasiPeringatan("Lengkapi Data");
-
-  if (value.title.length >= 100) return null;
-  if (value.lokasi.length >= 100) return null;
-  if (value.eventMaster_TipeAcaraId === 0)
-    return ComponentGlobal_NotifikasiPeringatan("Pilih Tipe Acara");
-  if (moment(value.tanggal).format() === "Invalid date")
-    return ComponentGlobal_NotifikasiPeringatan("Lengkapi Tanggal");
-  if (
-    moment(value.tanggal.toISOString().toString()).diff(moment(), "minutes") < 0
-  )
-    return null;
-  if (value.deskripsi.length >= 200) return null;
+  // if (_.values(value).includes(""))
+  //   return ComponentGlobal_NotifikasiPeringatan("Lengkapi Data");
+  // if (value.eventMaster_TipeAcaraId === 0)
+  //   return ComponentGlobal_NotifikasiPeringatan("Pilih Tipe Acara");
+  // if (moment(value.tanggal).format() === "Invalid date")
+  //   return ComponentGlobal_NotifikasiPeringatan("Lengkapi Tanggal");
+  // if (
+  //   moment(value.tanggal.toISOString().toString()).diff(moment(), "minutes") < 0
+  // )
+  //   return null;
 
   await Event_funCreate(value).then((res) => {
     if (res.status === 201) {
diff --git a/src/app_modules/event/detail/draft/index.tsx b/src/app_modules/event/detail/draft/index.tsx
index c7594333..cfc01bcc 100644
--- a/src/app_modules/event/detail/draft/index.tsx
+++ b/src/app_modules/event/detail/draft/index.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Button, Group, Stack } from "@mantine/core";
+import { Button, Group, Modal, Stack, Title } from "@mantine/core";
 import ComponentEvent_DetailData from "../../component/detail/detail_data";
 
 import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
@@ -13,6 +13,10 @@ import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/component_global/
 import React, { useState } from "react";
 import ComponentEvent_CatatanReject from "../../component/catatan_reject";
 import { useRouter } from "next/navigation";
+import moment from "moment";
+import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/component_global/notif_global/notifikasi_peringatan";
+import { Event_funDeleteById } from "../../fun/delete/fun_delete";
+import { useDisclosure } from "@mantine/hooks";
 
 export default function Event_DetailDraft({
   dataEvent,
@@ -29,25 +33,42 @@ export default function Event_DetailDraft({
           ""
         )}
         <ComponentEvent_DetailData data={dataEvent} />
-        <ButtonAction eventId={dataEvent?.id} />
+        <ButtonAction eventId={dataEvent?.id} tanggal={dataEvent.tanggal} />
       </Stack>
     </>
   );
 }
 
-function ButtonAction({ eventId }: { eventId: string }) {
+function ButtonAction({ eventId, tanggal }: { eventId: string; tanggal: any }) {
   const router = useRouter();
+  const [isLoadingDelete, setLoadingDelete] = useState(false);
+  const [isLoadingAjukan, setLoadingAjukan] = useState(false);
   const [tabsStatus, setTabsStatus] = useAtom(gs_event_status);
+  const [opened, { open, close }] = useDisclosure(false);
 
   async function onDelete() {
-    console.log(eventId);
+    await Event_funDeleteById(eventId).then((res) => {
+      if (res.status === 200) {
+        ComponentGlobal_NotifikasiBerhasil(res.message, 2000);
+        setLoadingDelete(true);
+        setTabsStatus("Draft");
+        close();
+        router.back();
+      } else {
+        ComponentGlobal_NotifikasiGagal(res.message);
+      }
+    });
   }
 
   async function onAjukan() {
+    if (moment(tanggal.toISOString().toString()).diff(moment(), "minutes") < 0)
+      return ComponentGlobal_NotifikasiPeringatan("Waktu acara telah lewat");
+
     await Event_funEditStatusById("2", eventId).then((res) => {
       if (res.status === 200) {
         ComponentGlobal_NotifikasiBerhasil(res.message, 2000);
         setTabsStatus("Review");
+        setLoadingAjukan(true);
         router.back();
       } else {
         ComponentGlobal_NotifikasiGagal(res.message);
@@ -57,8 +78,32 @@ function ButtonAction({ eventId }: { eventId: string }) {
 
   return (
     <>
+      <Modal opened={opened} onClose={close} centered withCloseButton={false}>
+        <Stack>
+          <Title order={6}>Yakin akan menghapus event ini?</Title>
+          <Group position="center">
+            <Button radius={"xl"} onClick={close}>
+              Batal
+            </Button>
+            <Button
+              loaderPosition="center"
+              loading={isLoadingDelete ? true : false}
+              radius={"xl"}
+              onClick={() => {
+                onDelete();
+              }}
+              color="red"
+            >
+              Hapus
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+
       <Group grow>
         <Button
+          loaderPosition="center"
+          loading={isLoadingAjukan ? true : false}
           radius={"xl"}
           color="yellow"
           onClick={() => {
@@ -71,7 +116,7 @@ function ButtonAction({ eventId }: { eventId: string }) {
           radius={"xl"}
           color="red"
           onClick={() => {
-            // onClick(router, setTabsStatus, dataEvent.id);
+            open();
           }}
         >
           Hapus
diff --git a/src/app_modules/event/detail/main_detail/index.tsx b/src/app_modules/event/detail/main_detail/index.tsx
index 0d25d48c..8a293bdb 100644
--- a/src/app_modules/event/detail/main_detail/index.tsx
+++ b/src/app_modules/event/detail/main_detail/index.tsx
@@ -43,6 +43,8 @@ export default function Event_DetailMain({
   const router = useRouter();
   const [total, setTotal] = useState(totalPeserta);
   const [peserta, setPeserta] = useState(listPeserta);
+  const [isLoading, setLoading] = useState(false);
+
   return (
     <>
       <Stack spacing={"lg"}>
@@ -53,10 +55,18 @@ export default function Event_DetailMain({
           </Button>
         ) : (
           <Button
+            loaderPosition="center"
+            loading={isLoading ? true : false}
             radius={"xl"}
             color="green"
             onClick={() => {
-              onJoin(userLoginId, dataEvent.id, setPeserta, setTotal);
+              onJoin(
+                userLoginId,
+                dataEvent.id,
+                setPeserta,
+                setTotal,
+                setLoading
+              );
             }}
           >
             JOIN
@@ -64,55 +74,6 @@ export default function Event_DetailMain({
         )}
 
         <ComponentEvent_ListPeserta listPeserta={listPeserta} total={total} />
-        {/* <Paper withBorder mt={"lg"}>
-          <Stack spacing={"md"} p={"md"}>
-            <Center>
-              <Title order={5}>Daftar Peserta ({total})</Title>
-            </Center>
-
-            {_.isEmpty(peserta) ? (
-              <Center>
-                <Text fz={"xs"} fw={"bold"}>
-                  - Tidak ada peserta -
-                </Text>
-              </Center>
-            ) : (
-              <Stack>
-                {peserta.map((e, i) => (
-                  <Stack key={i} spacing={"sm"}>
-                    <Grid>
-                      <Grid.Col
-                        span={"content"}
-                        onClick={() => {
-                          router.push(
-                            RouterProfile.katalog + e.User.Profile.id
-                          );
-                        }}
-                      >
-                        <Avatar
-                          sx={{ borderStyle: "solid", borderWidth: "0.5px" }}
-                          radius={"xl"}
-                          bg={"gray"}
-                          size={30}
-                          src={
-                            RouterProfile.api_foto_profile +
-                            e.User.Profile.imagesId
-                          }
-                        />
-                      </Grid.Col>
-                      <Grid.Col span={"auto"}>
-                        <Stack justify="center" h={"100%"}>
-                          <Text>{e.User.Profile.name}</Text>
-                        </Stack>
-                      </Grid.Col>
-                    </Grid>
-                    <Divider />
-                  </Stack>
-                ))}
-              </Stack>
-            )}
-          </Stack>
-        </Paper> */}
       </Stack>
     </>
   );
@@ -122,7 +83,8 @@ async function onJoin(
   userId: string,
   eventId: string,
   setPeserta: any,
-  setTotal: any
+  setTotal: any,
+  setLoading: any
 ) {
   const body = {
     userId: userId,
@@ -135,6 +97,7 @@ async function onJoin(
         await Event_countTotalPesertaById(eventId).then((ttl) => {
           setPeserta(val);
           setTotal(ttl);
+          setLoading(true);
           ComponentGlobal_NotifikasiBerhasil(res.message, 2000);
         });
       });
diff --git a/src/app_modules/event/edit/index.tsx b/src/app_modules/event/edit/index.tsx
index 7f121764..ef9878cb 100644
--- a/src/app_modules/event/edit/index.tsx
+++ b/src/app_modules/event/edit/index.tsx
@@ -23,6 +23,8 @@ import _ from "lodash";
 import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/component_global/notif_global/notifikasi_peringatan";
 import { IconAlertTriangle } from "@tabler/icons-react";
 import ComponentEvent_ErrorMaximalInput from "../component/error_maksimal_input";
+import ComponentGlobal_InputCountDown from "@/app_modules/component_global/input_countdown";
+import ComponentGlobal_ErrorInput from "@/app_modules/component_global/error_input";
 
 export default function Event_Edit({
   dataEvent,
@@ -32,6 +34,8 @@ export default function Event_Edit({
   listTipeAcara: MODEL_DEFAULT_MASTER[];
 }) {
   const router = useRouter();
+  const [isLoading, setLoading] = useState(false);
+
   const [value, setValue] = useState(dataEvent);
   const [tipe, setTipe] = useState(listTipeAcara);
 
@@ -45,13 +49,13 @@ export default function Event_Edit({
       <Stack px={"sm"}>
         <TextInput
           label="Judul"
-          placeholder="Masukan judul"
+          placeholder="judul"
           withAsterisk
           value={value.title}
           maxLength={100}
           error={
-            maxTitle.length >= 100 ? (
-              <ComponentEvent_ErrorMaximalInput max={100} />
+            value.title === "" ? (
+              <ComponentGlobal_ErrorInput text="Masukan judul" />
             ) : (
               ""
             )
@@ -86,13 +90,13 @@ export default function Event_Edit({
 
         <TextInput
           label="Lokasi"
-          placeholder="Masukan lokasi acara"
+          placeholder="lokasi acara"
           withAsterisk
           value={value.lokasi}
-          maxLength={200}
+          maxLength={100}
           error={
-            maxLokasi.length >= 200 ? (
-              <ComponentEvent_ErrorMaximalInput max={200} />
+            value.lokasi === "" ? (
+              <ComponentGlobal_ErrorInput text="Masukan lokasi" />
             ) : (
               ""
             )
@@ -113,6 +117,16 @@ export default function Event_Edit({
           label="Tanggal & Waktu "
           placeholder="Masukan tangal dan waktu acara"
           value={value.tanggal}
+          error={
+            moment(value.tanggal.toISOString().toString()).diff(
+              moment(),
+              "minutes"
+            ) < 0 ? (
+              <ComponentGlobal_ErrorInput text="Invalid Time" />
+            ) : (
+              ""
+            )
+          }
           onChange={(val) => {
             setValue({
               ...(value as any),
@@ -120,30 +134,55 @@ export default function Event_Edit({
             });
           }}
         />
-        <Textarea
-          label="Deskripsi"
-          placeholder="Deskripsikan acara yang akan di selenggarakan"
-          withAsterisk
-          autosize
-          value={value.deskripsi}
-          maxLength={500}
-          error={
-            maxDeskripsi.length >= 500 ? (
-              <ComponentEvent_ErrorMaximalInput max={500} />
-            ) : (
-              ""
-            )
-          }
-          onChange={(val) => {
-            setMaxDeskripsi(val.target.value);
-            setValue({
-              ...value,
-              deskripsi: val.target.value,
-            });
-          }}
-        />
 
-        <Button radius={"xl"} mt={"xl"} onClick={() => onUpdate(router, value)}>
+        <Stack spacing={5}>
+          <Textarea
+            label="Deskripsi"
+            placeholder="Deskripsikan acara yang akan di selenggarakan"
+            withAsterisk
+            autosize
+            value={value.deskripsi}
+            maxLength={300}
+            error={
+              value.deskripsi === "" ? (
+                <ComponentGlobal_ErrorInput text="Masukan deskripsi" />
+              ) : (
+                ""
+              )
+            }
+            onChange={(val) => {
+              setMaxDeskripsi(val.target.value);
+              setValue({
+                ...value,
+                deskripsi: val.target.value,
+              });
+            }}
+          />
+          <ComponentGlobal_InputCountDown
+            maxInput={300}
+            lengthInput={value.deskripsi.length}
+          />
+        </Stack>
+
+        <Button
+          style={{
+            transition: "0.5s",
+          }}
+          disabled={
+            value.title === "" ||
+            value.lokasi === "" ||
+            value.deskripsi === "" ||
+            value.eventMaster_TipeAcaraId === 0 ||
+            value.tanggal.toISOString.toString() ===
+              "function Date() { [native code] }" ||
+            moment(value.tanggal).diff(moment(), "minutes") < 0
+          }
+          loaderPosition="center"
+          loading={isLoading ? true : false}
+          radius={"xl"}
+          mt={"xl"}
+          onClick={() => onUpdate(router, value, setLoading)}
+        >
           Update
         </Button>
       </Stack>
@@ -151,13 +190,18 @@ export default function Event_Edit({
   );
 }
 
-async function onUpdate(router: AppRouterInstance, value: MODEL_EVENT) {
+async function onUpdate(
+  router: AppRouterInstance,
+  value: MODEL_EVENT,
+  setLoading: any
+) {
   if (_.values(value).includes(""))
     return ComponentGlobal_NotifikasiPeringatan("Lengkapi Data");
 
   await Event_funEditById(value).then((res) => {
     if (res.status === 200) {
       ComponentGlobal_NotifikasiBerhasil(res.message);
+      setLoading(true);
       router.back();
     } else {
       ComponentGlobal_NotifikasiGagal(res.message);
diff --git a/src/app_modules/event/fun/delete/fun_delete.ts b/src/app_modules/event/fun/delete/fun_delete.ts
index f2a891d0..cc15c255 100644
--- a/src/app_modules/event/fun/delete/fun_delete.ts
+++ b/src/app_modules/event/fun/delete/fun_delete.ts
@@ -9,8 +9,18 @@ export async function Event_funDeleteById(eventId: string) {
       id: eventId,
     },
   });
-
   if (!del) return { status: 400, message: "Gagal hapus data" };
+
+  // const delTemporary = await prisma.event.update({
+  //   where: {
+  //     id: eventId,
+  //   },
+  //   data: {
+  //     active: false,
+  //   },
+  // });
+  // if (!delTemporary) return { status: 400, message: "Gagal hapus data" };
+
   revalidatePath("/dev/event/main/status_page");
   return {
     status: 200,
diff --git a/src/app_modules/event/fun/get/get_event_by_status_id.ts b/src/app_modules/event/fun/get/get_list_event_by_status_id.ts
similarity index 94%
rename from src/app_modules/event/fun/get/get_event_by_status_id.ts
rename to src/app_modules/event/fun/get/get_list_event_by_status_id.ts
index f9940a92..962f446c 100644
--- a/src/app_modules/event/fun/get/get_event_by_status_id.ts
+++ b/src/app_modules/event/fun/get/get_list_event_by_status_id.ts
@@ -2,7 +2,10 @@
 
 import prisma from "@/app/lib/prisma";
 
-export async function Event_getByStatusId(statusId: string, authorId: string) {
+export async function Event_getListByStatusId(
+  statusId: string,
+  authorId: string
+) {
   if (statusId === "1") {
     const data = await prisma.event.findMany({
       orderBy: {
diff --git a/src/app_modules/event/main/beranda.tsx b/src/app_modules/event/main/beranda.tsx
index 575073aa..10e64cce 100644
--- a/src/app_modules/event/main/beranda.tsx
+++ b/src/app_modules/event/main/beranda.tsx
@@ -29,9 +29,10 @@ import ComponentEvent_BoxListStatus from "../component/box_list_status";
 import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
 import ComponentGlobal_AuthorNameOnHeader from "@/app_modules/component_global/author_name_on_header";
 import _ from "lodash";
-import { IconCirclePlus } from "@tabler/icons-react";
+import { IconCirclePlus, IconPencilPlus } from "@tabler/icons-react";
 import ComponentEvent_IsEmptyData from "../component/is_empty_data";
 import { useWindowScroll } from "@mantine/hooks";
+import ComponentGlobal_CardLoadingOverlay from "@/app_modules/component_global/loading_card";
 
 export default function Event_Beranda({
   dataEvent,
@@ -41,6 +42,8 @@ export default function Event_Beranda({
   const router = useRouter();
   const [isLoading, setLoading] = useState(false);
   const [scroll, scrollTo] = useWindowScroll();
+  const [eventId, setEventId] = useState("");
+  const [visible, setVisible] = useState(false);
 
   return (
     <>
@@ -60,50 +63,56 @@ export default function Event_Beranda({
             router.push(RouterEvent.create);
           }}
         >
-          <IconCirclePlus color="white" size={40} />
+          <IconPencilPlus color="white" />
         </ActionIcon>
       </Affix>
       {_.isEmpty(dataEvent) ? (
         <ComponentEvent_IsEmptyData text="Tidak ada data" />
       ) : (
-        <Box>
-          {Array(10)
-            .fill(0)
-            .map((e, i) => (
-              <Card key={i} shadow="lg" radius={"md"} withBorder mb={"sm"}>
-                <Card.Section px={"sm"} pt={"sm"}>
-                  <ComponentGlobal_AuthorNameOnHeader
-                    profileId={e?.Author.Profile.id}
-                    imagesId={e?.Author.Profile.imagesId}
-                    authorName={e?.Author.Profile.name}
-                  />
-                </Card.Section>
-                <Card.Section
-                  p={"sm"}
-                  onClick={() => router.push(RouterEvent.detail_main + e?.id)}
-                >
-                  <Stack>
-                    <Grid>
-                      <Grid.Col span={8}>
-                        <Title order={6} truncate>
-                          {e?.title}
-                        </Title>
-                      </Grid.Col>
-                      <Grid.Col span={4}>
-                        <Text fz={"sm"} truncate>
-                          {moment(e?.tanggal).format("ll")}
-                        </Text>
-                      </Grid.Col>
-                    </Grid>
-
-                    <Text fz={"sm"} lineClamp={2}>
-                      {e?.deskripsi}
+        dataEvent.map((e, i) => (
+          <Card key={i} shadow="lg" radius={"md"} withBorder mb={"sm"}>
+            <Card.Section px={"sm"} pt={"sm"}>
+              <ComponentGlobal_AuthorNameOnHeader
+                profileId={e?.Author?.Profile?.id}
+                imagesId={e?.Author?.Profile?.imagesId}
+                authorName={e?.Author?.Profile?.name}
+                isPembatas={true}
+              />
+            </Card.Section>
+            <Card.Section
+              p={"sm"}
+              onClick={() => {
+                setEventId(e?.id);
+                setVisible(true);
+                router.push(RouterEvent.detail_main + e?.id);
+              }}
+            >
+              <Stack>
+                <Grid>
+                  <Grid.Col span={8}>
+                    <Title order={6} truncate>
+                      {e?.title}
+                    </Title>
+                  </Grid.Col>
+                  <Grid.Col span={4}>
+                    <Text fz={"sm"} truncate>
+                      {moment(e?.tanggal).format("ll")}
                     </Text>
-                  </Stack>
-                </Card.Section>
-              </Card>
-            ))}
-        </Box>
+                  </Grid.Col>
+                </Grid>
+
+                <Text fz={"sm"} lineClamp={2}>
+                  {e?.deskripsi}
+                </Text>
+              </Stack>
+            </Card.Section>
+            {visible && e?.id === eventId ? (
+              <ComponentGlobal_CardLoadingOverlay />
+            ) : (
+              ""
+            )}
+          </Card>
+        ))
       )}
     </>
   );
diff --git a/src/app_modules/event/main/kontribusi/index.tsx b/src/app_modules/event/main/kontribusi/index.tsx
index 0e6043da..c3e060f3 100644
--- a/src/app_modules/event/main/kontribusi/index.tsx
+++ b/src/app_modules/event/main/kontribusi/index.tsx
@@ -23,6 +23,7 @@ import { MODEL_EVENT_PESERTA } from "../../model/interface";
 import ComponentGlobal_AuthorNameOnHeader from "@/app_modules/component_global/author_name_on_header";
 import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
 import _ from "lodash";
+import ComponentGlobal_CardLoadingOverlay from "@/app_modules/component_global/loading_card";
 
 export default function Event_Kontribusi({
   listKontribusi,
@@ -30,19 +31,8 @@ export default function Event_Kontribusi({
   listKontribusi: MODEL_EVENT_PESERTA[];
 }) {
   const router = useRouter();
-  const [tabsKontribusi, setTabsKontribusi] = useState<string | any>("Panitia");
-  const listTabs = [
-    {
-      id: 1,
-      path: <Event_KontribusiPanitia />,
-      value: "Panitia",
-    },
-    {
-      id: 2,
-      path: <Event_KontribusiPeserta />,
-      value: "Peserta",
-    },
-  ];
+  const [eventId, setEventId] = useState("");
+  const [visible, setVisible] = useState(false);
 
   if (_.isEmpty(listKontribusi))
     return (
@@ -67,9 +57,10 @@ export default function Event_Kontribusi({
           </Card.Section>
           <Card.Section
             p={"sm"}
-            onClick={() =>
-              router.push(RouterEvent.detail_kontribusi + e.Event.id)
-            }
+            onClick={() => {
+              setEventId(e?.id), setVisible(true);
+              router.push(RouterEvent.detail_kontribusi + e.Event.id);
+            }}
           >
             <Stack>
               <Grid>
@@ -90,15 +81,15 @@ export default function Event_Kontribusi({
               </Text> */}
 
               <Group position="center">
-                {e.Event.Event_Peserta.map((val) => (
-                  <Box key={val.id}>
+                {e.Event.Event_Peserta.map((val, i) => (
+                  <Box key={i}>
                     <Avatar
                       size={"lg"}
                       radius={"xl"}
                       sx={{ borderStyle: "solid", borderWidth: "0.5px" }}
                       src={
                         RouterProfile.api_foto_profile +
-                        val.User.Profile.imagesId
+                        val?.User?.Profile?.imagesId
                       }
                     />
                   </Box>
@@ -106,40 +97,13 @@ export default function Event_Kontribusi({
               </Group>
             </Stack>
           </Card.Section>
+          {visible && eventId === e?.id ? (
+            <ComponentGlobal_CardLoadingOverlay />
+          ) : (
+            ""
+          )}
         </Card>
       ))}
     </>
   );
-
-  // return (
-  //   <>
-  //     <Tabs
-  //       color="blue"
-  //       variant="pills"
-  //       radius="xl"
-  //       defaultValue="Panitia"
-  //       value={tabsKontribusi}
-  //       onTabChange={setTabsKontribusi}
-  //     >
-  //       <Stack>
-  //         <Tabs.List grow>
-  //           {listTabs.map((e) => (
-  //             <Tabs.Tab
-  //               key={e.id}
-  //               value={e.value}
-  //               bg={tabsKontribusi === e.value ? "blue" : "gray.1"}
-  //             >
-  //               Sebagai {e.value}
-  //             </Tabs.Tab>
-  //           ))}
-  //         </Tabs.List>
-  //         {listTabs.map((e) => (
-  //           <Tabs.Panel key={e.id} value={e.value}>
-  //             {e.path}
-  //           </Tabs.Panel>
-  //         ))}
-  //       </Stack>
-  //     </Tabs>
-  //   </>
-  // );
 }
diff --git a/src/app_modules/event/main/layout.tsx b/src/app_modules/event/main/layout.tsx
index 4b2ca566..7672da7b 100644
--- a/src/app_modules/event/main/layout.tsx
+++ b/src/app_modules/event/main/layout.tsx
@@ -44,7 +44,7 @@ export default function LayoutEvent_Main({
 
     {
       id: "2",
-      name: "Status Event",
+      name: "Status",
       path: RouterEvent.status_page,
       icon: <IconTimelineEventText />,
     },
diff --git a/src/app_modules/event/main/status_page/draft.tsx b/src/app_modules/event/main/status_page/draft.tsx
index e9f4714d..03557201 100644
--- a/src/app_modules/event/main/status_page/draft.tsx
+++ b/src/app_modules/event/main/status_page/draft.tsx
@@ -8,28 +8,25 @@ import { MODEL_EVENT } from "../../model/interface";
 import { useState } from "react";
 import ComponentEvent_BoxListStatus from "../../component/box_list_status";
 import _ from "lodash";
+import ComponentEvent_IsEmptyData from "../../component/is_empty_data";
 
 export default function Event_StatusDraft({
   listDraft,
 }: {
   listDraft: MODEL_EVENT[];
 }) {
-  const router = useRouter();
-
   if (_.isEmpty(listDraft))
-    return (
-      <Center h={"50vh"} fz={"sm"} fw={"bold"}>
-        Tidak Ada Event
-      </Center>
-    );
+    return <ComponentEvent_IsEmptyData text="Tidak ada data" />;
   return (
     <>
-      {listDraft
-        .map((e, i) => (
-          <Box key={e.id}>
-            <ComponentEvent_BoxListStatus data={e} path={RouterEvent.detail_draft}/>
-          </Box>
-        ))}
+      {listDraft.map((e, i) => (
+        <Box key={e.id}>
+          <ComponentEvent_BoxListStatus
+            data={e}
+            path={RouterEvent.detail_draft}
+          />
+        </Box>
+      ))}
     </>
   );
 }
diff --git a/src/app_modules/event/main/status_page/publish.tsx b/src/app_modules/event/main/status_page/publish.tsx
index aeba83b7..c847a563 100644
--- a/src/app_modules/event/main/status_page/publish.tsx
+++ b/src/app_modules/event/main/status_page/publish.tsx
@@ -7,6 +7,9 @@ import { useRouter } from "next/navigation";
 import { MODEL_EVENT } from "../../model/interface";
 import ComponentEvent_BoxListStatus from "../../component/box_list_status";
 import _ from "lodash";
+import ComponentEvent_IsEmptyData from "../../component/is_empty_data";
+import { useState } from "react";
+import ComponentGlobal_CardLoadingOverlay from "@/app_modules/component_global/loading_card";
 
 export default function Event_StatusPublish({
   listPublish,
@@ -14,22 +17,29 @@ export default function Event_StatusPublish({
   listPublish: MODEL_EVENT[];
 }) {
   const router = useRouter();
+  
 
   if (_.isEmpty(listPublish))
-    return (
-      <Center h={"50vh"} fz={"sm"} fw={"bold"}>
-        Tidak Ada Event
-      </Center>
-    );
+    return <ComponentEvent_IsEmptyData text="Tidak ada data" />;
 
   return (
     <>
-      {listPublish
-        .map((e, i) => (
-         <Box key={e.id}>
-          <ComponentEvent_BoxListStatus data={e} path={RouterEvent.detail_publish}/>
-         </Box>
-        ))}
+      {listPublish.map((e, i) => (
+        <Box key={e.id}>
+          <Box>
+            <ComponentEvent_BoxListStatus
+              data={e}
+              path={RouterEvent.detail_publish}
+             
+            />
+            {/* {visible && e?.id === eventId ? (
+              <ComponentGlobal_CardLoadingOverlay />
+            ) : (
+              ""
+            )} */}
+          </Box>
+        </Box>
+      ))}
     </>
   );
 }
diff --git a/src/app_modules/event/main/status_page/reject.tsx b/src/app_modules/event/main/status_page/reject.tsx
index a3be6d89..826d2265 100644
--- a/src/app_modules/event/main/status_page/reject.tsx
+++ b/src/app_modules/event/main/status_page/reject.tsx
@@ -7,19 +7,15 @@ import { useRouter } from "next/navigation";
 import { MODEL_EVENT } from "../../model/interface";
 import ComponentEvent_BoxListStatus from "../../component/box_list_status";
 import _ from "lodash";
+import ComponentEvent_IsEmptyData from "../../component/is_empty_data";
 
 export default function Event_StatusReject({
   listReject,
 }: {
   listReject: MODEL_EVENT[];
 }) {
-  const router = useRouter();
   if (_.isEmpty(listReject))
-    return (
-      <Center h={"50vh"} fz={"sm"} fw={"bold"}>
-        Tidak Ada Event
-      </Center>
-    );
+    return <ComponentEvent_IsEmptyData text="Tidak ada data" />;
   return (
     <>
       {listReject.map((e, i) => (
diff --git a/src/app_modules/event/main/status_page/review.tsx b/src/app_modules/event/main/status_page/review.tsx
index c14d91a2..725f0945 100644
--- a/src/app_modules/event/main/status_page/review.tsx
+++ b/src/app_modules/event/main/status_page/review.tsx
@@ -9,7 +9,8 @@ import { useState } from "react";
 import ComponentEvent_BoxListStatus from "../../component/box_list_status";
 import _ from "lodash";
 import { useShallowEffect } from "@mantine/hooks";
-import { Event_getByStatusId } from "../../fun/get/get_event_by_status_id";
+import { Event_getListByStatusId } from "../../fun/get/get_list_event_by_status_id";
+import ComponentEvent_IsEmptyData from "../../component/is_empty_data";
 
 export default function Event_StatusReview({
   listReview,
@@ -21,12 +22,8 @@ export default function Event_StatusReview({
   const router = useRouter();
 
 
-  if (_.isEmpty(listReview))
-    return (
-      <Center h={"50vh"} fz={"sm"} fw={"bold"}>
-        Tidak Ada Event
-      </Center>
-    );
+ if (_.isEmpty(listReview))
+    return <ComponentEvent_IsEmptyData text="Tidak ada data"/>
   return (
     <>
       {listReview.map((e, i) => (
diff --git a/src/util/mqtt_loader.tsx b/src/util/mqtt_loader.tsx
index 77b6cd16..b9934fbb 100644
--- a/src/util/mqtt_loader.tsx
+++ b/src/util/mqtt_loader.tsx
@@ -5,21 +5,52 @@ import mqtt_client from "./mqtt_client";
 import { useAtom } from "jotai";
 import { gs_coba_chat } from "@/app/makuro/gs_coba";
 import { evnPesan } from "./evn";
+import { Button, Stack } from "@mantine/core";
 
 export default function MqttLoader() {
   useEffect(() => {
     mqtt_client.on("connect", () => {
       console.log("connected");
-      // mqtt_client.subscribe("pesan");
+      mqtt_client.subscribe("pesan");
+      mqtt_client.subscribe("pesan2");
+
       // fetch("").then((res) => {
       //   mqtt_client.subscribe("pesan");
       // });
     });
 
-    // mqtt_client.on("message", (apa: any, itu: any) => {
-    //   console.log(itu)
-    //   evnPesan.emit("pesan", itu);
-    // });
+    mqtt_client.on("message", (topic: any, message: any) => {
+      // console.log(itu)
+      // evnPesan.emit("pesan", itu);
+      const data = JSON.parse(message.toString());
+
+      if (data) {
+        if (data.id === "1") {
+          console.log("ini untuk id satu", data.data);
+        }
+      }
+    });
   }, []);
-  return null;
+
+  const onClick = async () => {
+    mqtt_client.publish("pesan2", "apa pesannya 2");
+  };
+
+  const onClick2 = () => {
+    mqtt_client.publish(
+      "pesan",
+      JSON.stringify({
+        id: "2",
+        title: "donasi",
+        data: "databta",
+      })
+    );
+  };
+  return null
+  //  (
+  //   <Stack>
+  //     <Button onClick={onClick}>Tekan</Button>
+  //     <Button onClick={onClick2}>Tekan 2</Button>
+  //   </Stack>
+  // );
 }