Revisi Tampilan Admin

# fix :
- Tampilan Donasi
# feat :
- Penambahan App Information
## No Issuee

src/app/dev/admin/app-information/main/page.tsx

@@ -1,9 +1,17 @@
-import { AdminAppInformation_MainView } from "@/app_modules/admin/app-info";
+import { AdminAppInformation_MainView } from "@/app_modules/admin/app_info";
+import adminAppInformation_getMasterBank from "@/app_modules/admin/app_info/fun/master/get_list_bank";
+import adminAppInformation_getNomorAdmin from "@/app_modules/admin/app_info/fun/master/get_nomor_admin";
 
 export default async function Page() {
+  const nomorAdmin = await adminAppInformation_getNomorAdmin();
+  const listBank = await adminAppInformation_getMasterBank();
+
   return (
     <>
-      <AdminAppInformation_MainView />
+      <AdminAppInformation_MainView
+        nomorAdmin={nomorAdmin}
+        listBank={listBank}
+      />
     </>
   );
 }

src/app/dev/admin/colab/dashboard/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/colab/sub-menu/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/developer/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/donasi/detail/publish/[id]/page.tsx

@@ -8,13 +8,13 @@ import adminDonasi_getMasterStatus from "@/app_modules/admin/donasi/fun/master/g
 export default async function Page({ params }: { params: { id: string } }) {
   let donasiId = params.id;
   const dataPublish = await AdminDonasi_getOneById(params.id);
+  const countDonatur = await AdminDonasi_funCountDonatur(params.id);
+  const listMasterStatus = await adminDonasi_getMasterStatus();
   const listDonatur = await adminDonasi_getListDonatur({
     donasiId: donasiId,
     page: 1,
   });
-  const countDonatur = await AdminDonasi_funCountDonatur(params.id);
   const listPencairan = await AdminDonasi_getListPencairanDana(params.id);
-  const listMasterStatus = await adminDonasi_getMasterStatus();
 
   return (
     <>

src/app/dev/admin/donasi/main/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/donasi/pencairan_dana/[id]/page.tsx

@@ -1,6 +1,18 @@
 import { AdminDonasi_PencairanDana } from "@/app_modules/admin/donasi";
+import { AdminDonasi_getOneById } from "@/app_modules/admin/donasi/fun/get/get_one_by_id";
 
 export default async function Page({ params }: { params: { id: string } }) {
   let donasiId = params.id;
-  return <AdminDonasi_PencairanDana donasiId={donasiId} />;
+  const dataDonasi = await AdminDonasi_getOneById(donasiId);
+  const danaTerkumpul = dataDonasi?.terkumpul;
+  const totalPencairan = dataDonasi?.totalPencairan
+
+
+  return (
+    <AdminDonasi_PencairanDana
+      donasiId={donasiId}
+      danaTerkumpul={danaTerkumpul as any}
+      totalPencairan={totalPencairan as any}
+    />
+  );
 }

src/app/dev/admin/donasi/sub-detail/transfer-invoice-reimbursement/[id]/page.tsx

@@ -0,0 +1,10 @@
+import { AdminDonasi_BuktiTransferPencairan } from "@/app_modules/admin/donasi";
+
+export default async function Page({ params }: { params: { id: string } }) {
+  let imagaId = params.id;
+  return (
+    <>
+      <AdminDonasi_BuktiTransferPencairan imageId={imagaId} />
+    </>
+  );
+}

src/app/dev/admin/event/main/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/event/main/page.tsx

@@ -8,10 +8,8 @@ export default async function Page() {
   const countReview = await AdminEvent_funCountByStatusId("2");
   const countDraft = await AdminEvent_funCountByStatusId("3");
   const countReject = await AdminEvent_funCountByStatusId("4");
-  const countTipeAcara = await AdminEvent_funCountTipeAcara()
-  const countRiwayat = await AdminEvent_funCountRiwayat()
-
-
+  const countTipeAcara = await AdminEvent_funCountTipeAcara();
+  const countRiwayat = await AdminEvent_funCountRiwayat();
 
   return (
     <>

src/app/dev/admin/forum/main/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/investasi/main/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/job/main/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/main/dashboard/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/admin/vote/main/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component/loading_admin_page";
+import ComponentAdminGlobal_LoadingPage from "@/app_modules/admin/component_global/loading_admin_page";
 
 export default async function Page() {
   return (

src/app/dev/donasi/create/cerita_penggalang/[id]/page.tsx

@@ -2,15 +2,16 @@ import { CreateCeritaPenggalangDonasi } from "@/app_modules/donasi";
 import { Donasi_getTemporaryCreate } from "@/app_modules/donasi/fun/get/get_temporary_create";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 
-
 export default async function Page({ params }: { params: { id: string } }) {
-  
   const getTemporaryCreate = await Donasi_getTemporaryCreate(params.id);
-  const userId = await user_getOneUserId()
+  const userId = await user_getOneUserId();
 
   return (
     <>
-      <CreateCeritaPenggalangDonasi dataTemporary={getTemporaryCreate as any} userId={userId} />
+      <CreateCeritaPenggalangDonasi
+        dataTemporary={getTemporaryCreate as any}
+        userId={userId}
+      />
     </>
   );
 }

src/app/dev/donasi/proses_donasi/proses_transaksi/[id]/page.tsx

@@ -1,13 +1,19 @@
 import { Donasi_ProsesTransaksi } from "@/app_modules/donasi";
 import { Donasi_getOneInvoiceById } from "@/app_modules/donasi/fun/get/get_one_invoice_by_id";
+import donasi_getMasterNomorAdmin from "@/app_modules/donasi/fun/master/get_nomor_admin";
 
-export default async function Page({params}: {params: {id: string}}) {
+export default async function Page({ params }: { params: { id: string } }) {
   // console.log(params.id)
-  const dataInvoice = await Donasi_getOneInvoiceById(params.id)
-  // console.log(dataInvoice)
+  const dataInvoice = await Donasi_getOneInvoiceById(params.id);
+  const nomorAdmin = await donasi_getMasterNomorAdmin();
+  console.log(nomorAdmin);
+
   return (
     <>
-      <Donasi_ProsesTransaksi dataInvoice={dataInvoice as any} />
+      <Donasi_ProsesTransaksi
+        dataInvoice={dataInvoice as any}
+        nomorAdmin={nomorAdmin}
+      />
     </>
   );
 }

src/app/dev/event/main/beranda/page.tsx

@@ -2,11 +2,11 @@ import { Event_Beranda } from "@/app_modules/event";
 import { Event_getListAllPublish } from "@/app_modules/event/fun/get/get_list_all_publish";
 
 export default async function Page() {
-  const dataEvent = await Event_getListAllPublish()
+  const dataEvent = await Event_getListAllPublish();
 
   return (
     <>
-      <Event_Beranda dataEvent={dataEvent as any}/>
+      <Event_Beranda dataEvent={dataEvent as any} />
     </>
   );
 }

src/app/lib/router_admin/router_admin_donasi.ts

@@ -5,5 +5,7 @@ export const RouterAdminDonasi = {
   table_reject: "/dev/admin/donasi/sub-menu/reject",
   table_kategori: "/dev/admin/donasi/sub-menu/kategori",
   transfer_invoice: "/dev/admin/donasi/sub-detail/transfer-invoice/",
+  transfer_invoice_reimbursement:
+    "/dev/admin/donasi/sub-detail/transfer-invoice-reimbursement/",
   informasi: "/dev/admin/donasi/sub-menu/informasi",
 };

src/app/makuro/page.tsx

@@ -1,11 +1,6 @@
 "use client";
+import Coba from "@/ui/Coba";
 import { useState } from "react";
-import useInfiniteScroll, {
-  ScrollDirection,
-} from "react-easy-infinite-scroll-hook";
-import { createItems, loadMore } from "./_util";
-import { useShallowEffect } from "@mantine/hooks";
-import { Center, Loader, Text } from "@mantine/core";
 // Beda Package
 import InfiniteScroll from "react-infinite-scroll-component";
 
@@ -52,50 +47,5 @@ export default function App() {
     padding: 8,
   };
 
-  return (
-    <>
-      <div id="scrollableDiv" style={{ height: "100vh", overflow: "auto" }}>
-        <InfiniteScroll
-          dataLength={list.length}
-          next={fetchMoreData}
-          hasMore={true}
-          loader={
-            <center>
-              <h4>Loading...</h4>
-            </center>
-          }
-          scrollableTarget="scrollableDiv"
-        >
-          {list.map((i, index) => (
-            <div style={style} key={index}>
-              div - #{index}
-            </div>
-          ))}
-        </InfiniteScroll>
-      </div>
-    </>
-  );
-
-  return (
-    <Center>
-      <div>
-        <Center>{isLoading && <Loader />}</Center>
-
-        <div
-          // ref={ref as any}
-          className="List"
-          style={{
-            height: 500,
-            overflowY: "auto",
-          }}
-        >
-          {data.map((key: any) => (
-            <div className="Row" key={key}>
-              {key}
-            </div>
-          ))}
-        </div>
-      </div>
-    </Center>
-  );
+  return <Coba />;
 }

src/app_modules/admin/app-info/main/index.tsx

@@ -1,45 +0,0 @@
-"use client";
-
-import { Group, Stack, Text, Title } from "@mantine/core";
-import { list } from "postcss";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
-
-export default function AdminAppInformation_MainView() {
-  return (
-    <>
-      <Stack h={"100%"}>
-        <ComponentAdminGlobal_HeaderTamplate name="App Information" />
-        <InformasiWhatApps />
-      </Stack>
-    </>
-  );
-}
-
-function InformasiWhatApps() {
-  return (
-    <>
-      <Stack spacing={"xs"}>
-        <Group
-          position="apart"
-          bg={"gray.4"}
-          p={"xs"}
-          style={{ borderRadius: "6px" }}
-        >
-          <Title order={4}>Informasi WhatsApp</Title>
-          {/* <TextInput
-            icon={<IconSearch size={20} />}
-            radius={"xl"}
-            placeholder="Masukan username"
-            onChange={(val) => {
-              onSearch(val.currentTarget.value);
-            }}
-          /> */}
-        </Group>
-
-        
-
-
-      </Stack>
-    </>
-  );
-}

src/app_modules/admin/app_info/fun/create/fun_create_new_bank.ts

@@ -0,0 +1,23 @@
+"use server";
+
+import prisma from "@/app/lib/prisma";
+
+export default async function adminAppInformation_createBank({
+  data,
+}: {
+  data: any;
+}) {
+  const count = await prisma.masterBank.count({});
+  const idBank = count + 1;
+
+  const create = await prisma.masterBank.create({
+    data: {
+      id: idBank.toString(),
+      name: data.name,
+      norek: data.norek,
+    },
+  });
+
+  if (!create) return { status: 400, message: "Gagal menambahkan" };
+  return { status: 200, message: "Berhasil menambahkan" };
+}

src/app_modules/admin/app_info/fun/get/get_one_bank_by_id.ts

@@ -0,0 +1,17 @@
+"use server";
+
+import prisma from "@/app/lib/prisma";
+
+export default async function adminAppInformation_getOneBankById({
+  id,
+}: {
+  id: string;
+}) {
+  const data = await prisma.masterBank.findFirst({
+    where: {
+      id: id,
+    },
+  });
+
+  return data;
+}

src/app_modules/admin/app_info/fun/master/get_list_bank.ts

@@ -0,0 +1,13 @@
+"use server";
+
+import prisma from "@/app/lib/prisma";
+
+export default async function adminAppInformation_getMasterBank() {
+  const data = await prisma.masterBank.findMany({
+    orderBy: {
+      createdAt: "desc",
+    },
+  });
+
+  return data;
+}

src/app_modules/admin/app_info/fun/master/get_nomor_admin.ts

@@ -0,0 +1,13 @@
+"use server";
+
+import prisma from "@/app/lib/prisma";
+
+export default async function adminAppInformation_getNomorAdmin() {
+  const data = await prisma.nomorAdmin.findFirst({
+    where: {
+      isActive: true,
+    },
+  });
+
+  return data;
+}

src/app_modules/admin/app_info/fun/update/fun_udpate_status_bank.ts

@@ -0,0 +1,22 @@
+"use server";
+
+import prisma from "@/app/lib/prisma";
+import { MODEL_DATA_BANK } from "@/app_modules/investasi/model/model_investasi";
+
+export default async function adminAppInformation_updateStatusBankById({
+  data,
+}: {
+  data: MODEL_DATA_BANK;
+}) {
+  const updt = await prisma.masterBank.update({
+    where: {
+      id: data.id,
+    },
+    data: {
+      active: data.active,
+    },
+  });
+
+  if (!updt) return { status: 400, message: "Gagal update" };
+  return { status: 200, message: "Berhasil update" };
+}

src/app_modules/admin/app_info/fun/update/fun_update_data_bank.ts

@@ -0,0 +1,23 @@
+"use server";
+
+import prisma from "@/app/lib/prisma";
+import { MODEL_DATA_BANK } from "@/app_modules/investasi/model/model_investasi";
+
+export default async function adminAppInformation_updateDataBankById({
+  data,
+}: {
+  data: MODEL_DATA_BANK;
+}) {
+  const updt = await prisma.masterBank.update({
+    where: {
+      id: data.id,
+    },
+    data: {
+      name: data.name,
+      norek: data.norek,
+    },
+  });
+
+  if (!updt) return { status: 400, message: "Gagal update" };
+  return { status: 200, message: "Berhasil update" };
+}

src/app_modules/admin/app_info/fun/update/fun_update_nomor.ts

@@ -0,0 +1,21 @@
+"use server";
+
+import prisma from "@/app/lib/prisma";
+
+export default async function adminAppInformation_funUpdateNomorAdmin({
+  data,
+}: {
+  data: any;
+}) {
+  const updt = await prisma.nomorAdmin.update({
+    where: {
+      id: data.id,
+    },
+    data: {
+      nomor: data.nomor,
+    },
+  });
+
+  if (!updt) return { status: 400, message: "Gagal update" };
+  return { status: 200, message: "Berhasil update" };
+}

src/app_modules/admin/app_info/main/index.tsx

@@ -0,0 +1,60 @@
+"use client";
+
+import {
+  ActionIcon,
+  Button,
+  Center,
+  Grid,
+  Group,
+  Modal,
+  Paper,
+  ScrollArea,
+  Space,
+  Stack,
+  Table,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from "@mantine/core";
+import { list } from "postcss";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
+import { useState } from "react";
+import {
+  IconEdit,
+  IconEye,
+  IconEyeClosed,
+  IconEyeOff,
+  IconPhone,
+  IconPlus,
+  IconTrack,
+  IconTrash,
+} from "@tabler/icons-react";
+import { ComponentGlobalAdmin_NotifikasiPeringatan } from "../../component_global/admin_notifikasi/notifikasi_peringatan";
+import adminAppInformation_funUpdateNomorAdmin from "../fun/update/fun_update_nomor";
+import { ComponentGlobalAdmin_NotifikasiBerhasil } from "../../component_global/admin_notifikasi/notifikasi_berhasil";
+import { ComponentGlobalAdmin_NotifikasiGagal } from "../../component_global/admin_notifikasi/notifikasi_gagal";
+import adminAppInformation_getNomorAdmin from "../fun/master/get_nomor_admin";
+import { MODEL_DATA_BANK } from "@/app_modules/investasi/model/model_investasi";
+import _ from "lodash";
+import InformasiWhatApps from "./info_whatsapp";
+import InformasiBank from "./info_bank";
+
+export default function AdminAppInformation_MainView({
+  nomorAdmin,
+  listBank,
+}: {
+  nomorAdmin: any;
+  listBank: any[];
+}) {
+  return (
+    <>
+      <Stack h={"100%"}>
+        <ComponentAdminGlobal_HeaderTamplate name="App Information" />
+        <InformasiWhatApps nomorAdmin={nomorAdmin} />
+        <Space h={50} />
+        <InformasiBank listBank={listBank} />
+      </Stack>
+    </>
+  );
+}

src/app_modules/admin/app_info/main/info_bank.tsx

@@ -0,0 +1,401 @@
+"use client";
+
+import { MODEL_DATA_BANK } from "@/app_modules/investasi/model/model_investasi";
+import {
+  Center,
+  Stack,
+  ActionIcon,
+  Tooltip,
+  Group,
+  Title,
+  Button,
+  Paper,
+  ScrollArea,
+  Modal,
+  TextInput,
+  Text,
+  Table,
+  SimpleGrid,
+  Grid,
+  Switch,
+} from "@mantine/core";
+import {
+  IconEye,
+  IconEyeOff,
+  IconEdit,
+  IconTrash,
+  IconPlus,
+  IconCirclePlus,
+} from "@tabler/icons-react";
+import _, { fill } from "lodash";
+import { useState } from "react";
+import adminAppInformation_createBank from "../fun/create/fun_create_new_bank";
+import adminAppInformation_getMasterBank from "../fun/master/get_list_bank";
+import { ComponentGlobalAdmin_NotifikasiBerhasil } from "../../component_global/admin_notifikasi/notifikasi_berhasil";
+import { ComponentGlobalAdmin_NotifikasiGagal } from "../../component_global/admin_notifikasi/notifikasi_gagal";
+import adminAppInformation_getOneBankById from "../fun/get/get_one_bank_by_id";
+import { useShallowEffect } from "@mantine/hooks";
+import adminAppInformation_updateDataBankById from "../fun/update/fun_update_data_bank";
+import adminAppInformation_updateStatusBankById from "../fun/update/fun_udpate_status_bank";
+
+export default function InformasiBank({
+  listBank,
+}: {
+  listBank: MODEL_DATA_BANK[];
+}) {
+  const [data, setData] = useState(listBank);
+  const [isCreate, setIsCreate] = useState(false);
+  const [newData, setNewData] = useState({
+    name: "",
+    norek: "",
+  });
+
+  const [isUpdate, setIsUpdate] = useState(false);
+  const [updateData, setUpdateData] = useState({
+    id: "",
+    name: "",
+    norek: "",
+  });
+
+  const [isActivation, setIsActivation] = useState(false);
+  const [updateStatus, setUpdateStatus] = useState({
+    id: "",
+    active: "",
+  });
+
+  const [checked, setChecked] = useState(false);
+
+  async function onCreate() {
+    const create = await adminAppInformation_createBank({ data: newData });
+    if (create.status === 200) {
+      const loadData = await adminAppInformation_getMasterBank();
+      setData(loadData);
+      ComponentGlobalAdmin_NotifikasiBerhasil(create.message);
+    } else {
+      ComponentGlobalAdmin_NotifikasiGagal(create.message);
+    }
+    setIsCreate(false);
+  }
+
+  async function onUpdate() {
+    const updt = await adminAppInformation_updateDataBankById({
+      data: updateData as any,
+    });
+    if (updt.status === 200) {
+      const loadData = await adminAppInformation_getMasterBank();
+      setData(loadData);
+      ComponentGlobalAdmin_NotifikasiBerhasil(updt.message);
+      setIsUpdate(false);
+    } else {
+      ComponentGlobalAdmin_NotifikasiGagal(updt.message);
+    }
+  }
+
+  async function onUpdateActivation({
+    id,
+    value,
+  }: {
+    id: string;
+    value: boolean;
+  }) {
+    const data = {
+      id: id,
+      active: value,
+    };
+    const updt = await adminAppInformation_updateStatusBankById({
+      data: data as any,
+    });
+    if (updt.status === 200) {
+      const loadData = await adminAppInformation_getMasterBank();
+      setData(loadData);
+      ComponentGlobalAdmin_NotifikasiBerhasil(updt.message);
+      setIsActivation(false);
+    } else {
+      ComponentGlobalAdmin_NotifikasiGagal(updt.message);
+    }
+  }
+
+  const rowTable = _.isEmpty(data) ? (
+    <tr>
+      <Center>
+        <Text>Tidak ada data</Text>
+      </Center>
+    </tr>
+  ) : (
+    data.map((e, i) => (
+      <tr key={i}>
+        <td>
+          <Center>
+            <Text>{e?.name}</Text>
+          </Center>
+        </td>
+        <td>
+          <Center>
+            <Text>{e?.norek}</Text>
+          </Center>
+        </td>
+        <td>
+          <Center>
+            <Switch
+              color="orange"
+              onLabel="ON"
+              offLabel="OFF"
+              checked={e?.active}
+              onChange={(val) => {
+                setIsActivation(true);
+                setUpdateStatus({
+                  id: e?.id,
+                  active: val.currentTarget.checked as any,
+                });
+              }}
+            />
+          </Center>
+        </td>
+        <td>
+          <Stack align="center" justify="center">
+            <ActionIcon
+              radius={"xl"}
+              variant="transparent"
+              onClick={() => {
+                setIsUpdate(true);
+                setIsCreate(false);
+                setUpdateData({
+                  id: e?.id,
+                  name: e?.name,
+                  norek: e?.norek,
+                });
+              }}
+            >
+              <Tooltip label="Edit">
+                <IconEdit color="green" />
+              </Tooltip>
+            </ActionIcon>
+          </Stack>
+        </td>
+      </tr>
+    ))
+  );
+
+  return (
+    <>
+      <Stack spacing={"xs"}>
+        <Group
+          position="apart"
+          bg={"gray.4"}
+          p={"xs"}
+          style={{ borderRadius: "6px" }}
+        >
+          <Title order={4}>Informasi Bank</Title>
+          <Button
+            w={120}
+            leftIcon={<IconCirclePlus />}
+            radius={"xl"}
+            onClick={() => {
+              setIsCreate(true);
+              setIsUpdate(false);
+            }}
+          >
+            Tambah
+          </Button>
+        </Group>
+      </Stack>
+
+      <Grid>
+        <Grid.Col span={"auto"}>
+          <Paper p={"md"} withBorder shadow="lg" h={"50vh"}>
+            <ScrollArea w={"100%"} h={"90%"} offsetScrollbars>
+              <Table
+                verticalSpacing={"xs"}
+                horizontalSpacing={"md"}
+                p={"md"}
+                w={"100%"}
+                striped
+                highlightOnHover
+              >
+                <thead>
+                  <tr>
+                    <th>
+                      <Center>Nama Bank</Center>
+                    </th>
+                    <th>
+                      <Center>Nomor Rekening</Center>
+                    </th>
+                    <th>
+                      <Center>Status</Center>
+                    </th>
+                    <th>
+                      <Center>Aksi</Center>
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>{rowTable}</tbody>
+              </Table>
+            </ScrollArea>
+            {/* <Center mt={"xl"}>
+                <Pagination
+                  total={10}
+                  // value={isActivePage}
+                  // total={isNPage}
+                  // onChange={(val) => {
+                  //   onPageClick(val);
+                  // }}
+                />
+              </Center> */}
+          </Paper>
+        </Grid.Col>
+
+        <Grid.Col span={4}>
+          {isCreate ? (
+            <Paper p={"md"} withBorder shadow="lg">
+              <Stack>
+                <Center>
+                  <Title order={5}>Tambah Daftar Bank</Title>
+                </Center>
+                <TextInput
+                  label={"Nama Bank"}
+                  placeholder="Masukan nama bank"
+                  onChange={(val) => {
+                    setNewData({
+                      ...newData,
+                      name: val.currentTarget.value,
+                    });
+                  }}
+                />
+                <TextInput
+                  label={"Nomor Rekening Bank"}
+                  placeholder=" Masukan nomor rekening bank"
+                  type="number"
+                  onChange={(val) => {
+                    setNewData({
+                      ...newData,
+                      norek: val.currentTarget.value,
+                    });
+                  }}
+                />
+                <Group position="right" align="flex-end">
+                  <Button
+                    radius={"xl"}
+                    onClick={() => {
+                      setIsCreate(false);
+                    }}
+                  >
+                    Batal
+                  </Button>
+                  <Button
+                    style={{ transition: "0.5s" }}
+                    disabled={_.values(newData).includes("") ? true : false}
+                    radius={"xl"}
+                    color="green"
+                    onClick={() => {
+                      onCreate();
+                    }}
+                  >
+                    Simpan
+                  </Button>
+                </Group>
+              </Stack>
+            </Paper>
+          ) : (
+            ""
+          )}
+          {isUpdate ? (
+            <Paper p={"md"} withBorder shadow="lg">
+              <Stack>
+                <Center>
+                  <Title order={5}>Update Data Bank</Title>
+                </Center>
+                <TextInput
+                  label={"Nama Bank"}
+                  placeholder="Masukan nama bank"
+                  value={updateData.name}
+                  onChange={(val) => {
+                    const value = val.currentTarget.value;
+                    setUpdateData({ ...updateData, name: value });
+                  }}
+                />
+                <TextInput
+                  label={"Nomor Rekening Bank"}
+                  placeholder=" Masukan nomor rekening bank"
+                  type="number"
+                  value={updateData.norek}
+                  onChange={(val) => {
+                    const value = val.currentTarget.value;
+                    setUpdateData({ ...updateData, norek: value });
+                  }}
+                />
+                <Group position="right">
+                  <Button
+                    radius={"xl"}
+                    onClick={() => {
+                      setIsUpdate(false);
+                    }}
+                  >
+                    Batal
+                  </Button>
+                  <Button
+                    style={{ transition: "0.5s" }}
+                    disabled={
+                      updateData?.name === "" || updateData?.norek === ""
+                        ? true
+                        : false
+                    }
+                    radius={"xl"}
+                    color="green"
+                    onClick={() => {
+                      onUpdate();
+                    }}
+                  >
+                    Simpan
+                  </Button>
+                </Group>
+              </Stack>
+            </Paper>
+          ) : (
+            ""
+          )}
+        </Grid.Col>
+      </Grid>
+
+      {/* Activasi bank */}
+      <Modal
+        centered
+        withCloseButton={false}
+        opened={isActivation}
+        onClose={() => setIsActivation(false)}
+      >
+        <Stack align="center">
+          <Title order={5}>
+            Anda ingin{" "}
+            {updateStatus.active ? (
+              <Text span inherit>
+                mengaktifkan
+              </Text>
+            ) : (
+              <Text span inherit>
+                menonaktifkan
+              </Text>
+            )}{" "}
+            Bank ini ?
+          </Title>
+          <Group>
+            <Button radius={"xl"} onClick={() => setIsActivation(false)}>
+              Batal
+            </Button>
+            <Button
+              color="green"
+              radius={"xl"}
+              onClick={() => {
+                onUpdateActivation({
+                  id: updateStatus.id,
+                  value: updateStatus.active as any,
+                });
+              }}
+            >
+              Iya
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
+    </>
+  );
+}

src/app_modules/admin/app_info/main/info_whatsapp.tsx

@@ -0,0 +1,135 @@
+" use client";
+
+import {
+  Stack,
+  Group,
+  Title,
+  Paper,
+  ActionIcon,
+  TextInput,
+  Button,
+  Box,
+  Tooltip,
+} from "@mantine/core";
+import { IconEdit, IconPhone } from "@tabler/icons-react";
+import { useState } from "react";
+import { ComponentGlobalAdmin_NotifikasiBerhasil } from "../../component_global/admin_notifikasi/notifikasi_berhasil";
+import { ComponentGlobalAdmin_NotifikasiGagal } from "../../component_global/admin_notifikasi/notifikasi_gagal";
+import adminAppInformation_getNomorAdmin from "../fun/master/get_nomor_admin";
+import adminAppInformation_funUpdateNomorAdmin from "../fun/update/fun_update_nomor";
+
+export default function InformasiWhatApps({ nomorAdmin }: { nomorAdmin: any }) {
+  const [disabled, setDisable] = useState(true);
+  const [dataNomor, setDataNomor] = useState(nomorAdmin);
+  const [updateNomor, setUpdateNomor] = useState("");
+
+  async function onUpdate() {
+    const newNumber = (dataNomor.nomor = updateNomor);
+    setDataNomor({
+      ...dataNomor,
+      nomor: newNumber,
+    });
+
+    const updt = await adminAppInformation_funUpdateNomorAdmin({
+      data: dataNomor,
+    });
+    if (updt.status === 200) {
+      setDisable(true);
+      setUpdateNomor("");
+      const loadDdata = await adminAppInformation_getNomorAdmin();
+      setDataNomor(loadDdata);
+      if (loadDdata) {
+        ComponentGlobalAdmin_NotifikasiBerhasil(updt.message);
+        return;
+      }
+    } else {
+      ComponentGlobalAdmin_NotifikasiGagal(updt.message);
+    }
+  }
+
+  return (
+    <>
+      <Stack>
+        <Stack spacing={"xs"}>
+          <Group
+            position="apart"
+            bg={"gray.4"}
+            p={"xs"}
+            style={{ borderRadius: "6px" }}
+          >
+            <Title order={4}>Informasi WhatsApp</Title>
+          </Group>
+        </Stack>
+
+        <Paper w={"50%"} withBorder p={"md"}>
+          <Stack>
+            <Paper bg={"gray.4"} p={"xl"}>
+              <Group position="apart">
+                <Title order={2}>{`+${dataNomor.nomor}`}</Title>
+                <Tooltip label={"Edit"}>
+                  <ActionIcon
+                    style={{ transition: "0.2s" }}
+                    variant="subtle"
+                    disabled={disabled ? false : true}
+                    radius={"xl"}
+                    onClick={() => {
+                      setDisable(false);
+                      setUpdateNomor(dataNomor.nomor);
+                    }}
+                  >
+                    <IconEdit
+                      style={{ transition: "0.2s" }}
+                      color={disabled ? "green" : "gray"}
+                    />
+                  </ActionIcon>
+                </Tooltip>
+              </Group>
+            </Paper>
+
+            {disabled ? (
+              ""
+            ) : (
+              <Stack>
+                <TextInput
+                  disabled={disabled ? true : false}
+                  type="number"
+                  placeholder="Update nomor admin"
+                  icon={<IconPhone />}
+                  value={updateNomor}
+                  label={<Title order={6}>Nomor Aktif Admin</Title>}
+                  onChange={(val) => {
+                    setUpdateNomor(val.currentTarget.value);
+                  }}
+                />
+                <Group position="right">
+                  <Button
+                    style={{ transition: "0.2s" }}
+                    disabled={disabled ? true : false}
+                    radius={"xl"}
+                    onClick={() => {
+                      setDisable(true);
+                      setUpdateNomor("");
+                    }}
+                  >
+                    Batal
+                  </Button>
+                  <Button
+                    style={{ transition: "0.2s" }}
+                    disabled={disabled || updateNomor === "" ? true : false}
+                    color="green"
+                    radius={"xl"}
+                    onClick={() => {
+                      onUpdate();
+                    }}
+                  >
+                    Update
+                  </Button>
+                </Group>
+              </Stack>
+            )}
+          </Stack>
+        </Paper>
+      </Stack>
+    </>
+  );
+}

src/app_modules/admin/colab/dashboard/index.tsx

@@ -2,7 +2,7 @@
 
 import { Stack, SimpleGrid, Paper, Group, Title, Text } from "@mantine/core";
 import { useRouter } from "next/navigation";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 
 export default function AdminColab_Dashboard({
   countPublish,

src/app_modules/admin/colab/sub_menu/group.tsx

@@ -17,7 +17,7 @@ import {
   SimpleGrid,
   Box,
 } from "@mantine/core";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import {
   MODEL_COLLABORATION,
   MODEL_COLLABORATION_ROOM_CHAT,

src/app_modules/admin/colab/sub_menu/publish.tsx

@@ -18,7 +18,7 @@ import {
   Textarea,
   Box,
 } from "@mantine/core";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import { MODEL_COLLABORATION } from "@/app_modules/colab/model/interface";
 import { useState } from "react";
 import { useDisclosure, useShallowEffect } from "@mantine/hooks";

src/app_modules/admin/colab/sub_menu/reject.tsx

@@ -14,7 +14,7 @@ import {
   Box,
   Pagination,
 } from "@mantine/core";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import { useState } from "react";
 import { MODEL_COLLABORATION } from "@/app_modules/colab/model/interface";
 import adminColab_getListAllRejected from "../fun/get/get_list_all_reject";

src/app_modules/admin/component_global/back_button.tsx

@@ -5,7 +5,7 @@ import { IconChevronLeft } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 
-export default function ComponentGlobalAdmin_BackButton() {
+export default function ComponentGlobalAdmin_BackButton({path}:{path?:string}) {
   const router = useRouter();
   const [isLoading, setLoading] = useState(false);
 
@@ -23,7 +23,12 @@ export default function ComponentGlobalAdmin_BackButton() {
           onClick={() => {
             setLoading(true);
             // setTimeout(() => , 3000);
-            router.back();
+            if(path==null){
+              router.back();
+            }else{
+              router.push(path)
+            }
+            
           }}
         >
           Kembali

src/app_modules/admin/component_global/tampilan_rupiah.tsx

@@ -0,0 +1,20 @@
+import { Text } from "@mantine/core";
+
+export default function ComponentAdminGlobal_TampilanRupiahDonasi({
+  nominal,
+  fontSize,
+}: {
+  nominal: number;
+  fontSize?: number;
+}) {
+  return (
+    <>
+      <Text fz={fontSize ? fontSize : "md"}>
+        Rp.{" "}
+        {new Intl.NumberFormat("id-ID", { maximumFractionDigits: 10 }).format(
+          nominal
+        )}
+      </Text>
+    </>
+  );
+}

src/app_modules/admin/developer/index.tsx

@@ -14,7 +14,7 @@ import {
   TextInput,
   Title,
 } from "@mantine/core";
-import ComponentAdminGlobal_HeaderTamplate from "../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../component_global/header_tamplate";
 import { MODEL_USER } from "@/app_modules/home/model/interface";
 import _ from "lodash";
 import { IconSearch } from "@tabler/icons-react";

src/app_modules/admin/donasi/component/tampilan_detail_cerita.tsx

@@ -0,0 +1,34 @@
+"use client"
+
+import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
+import { MODEL_CERITA_DONASI } from "@/app_modules/donasi/model/interface";
+import { Paper, Stack, Title, Box, AspectRatio, Image, Text } from "@mantine/core";
+
+export default function ComponentAdminDonasi_CeritaPenggalangDana({
+  cerita,
+}: {
+  cerita: MODEL_CERITA_DONASI;
+}) {
+  return (
+    <>
+      {/* <pre>{JSON.stringify(cerita, null, 2)}</pre> */}
+      <Paper radius={"md"} p={"md"} withBorder>
+        <Stack>
+          <Title order={5}>Cerita Penggalang Dana</Title>
+          <Text>{cerita.pembukaan}</Text>
+
+          <Box>
+            <AspectRatio ratio={16 / 9} mah={300} mx={"auto"}>
+              <Image
+                alt="Gambar_cerita"
+                src={RouterDonasi.api_gambar_cerita + `${cerita.imagesId}`}
+              />
+            </AspectRatio>
+          </Box>
+
+          <Text>{cerita.cerita}</Text>
+        </Stack>
+      </Paper>
+    </>
+  );
+}

src/app_modules/admin/donasi/component/tampilan_detail_donasi.tsx

@@ -0,0 +1,50 @@
+"use client"
+
+import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
+import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
+import { MODEL_DONASI } from "@/app_modules/donasi/model/interface";
+import { Paper, Stack, Title, Box, AspectRatio, Group, Image, Text } from "@mantine/core";
+
+export default function ComponentAdminDonasi_TampilanDetailDonasi({ donasi }: { donasi: MODEL_DONASI }) {
+  return (
+    <>
+      <Paper radius={"md"} p={"md"} withBorder>
+        <Stack>
+          <Title order={5}>Detail Data Donasi</Title>
+          <Stack>
+            <Box>
+              <AspectRatio ratio={1 / 1} mah={300} mx={"auto"}>
+                <Image
+                  alt="Foto"
+                  src={RouterDonasi.api_gambar + `${donasi.imagesId}`}
+                />
+              </AspectRatio>
+            </Box>
+
+            <Stack spacing={0}>
+              <Title order={4}>{donasi.title}</Title>
+              <Text fz={"xs"}>
+                Durasi: {donasi.DonasiMaster_Durasi.name} hari
+              </Text>
+            </Stack>
+
+            <Stack spacing={0}>
+              <Group>
+                <Text fz={12}>Dana dibutuhkan</Text>
+                <Title order={4} c="blue">
+                  <TampilanRupiahDonasi nominal={+donasi.target} />
+                </Title>
+              </Group>
+              <Group>
+                <Text fz={12}>Kategori</Text>
+                <Title order={4} c="blue">
+                  {donasi.DonasiMaster_Ketegori.name}
+                </Title>
+              </Group>
+            </Stack>
+          </Stack>
+        </Stack>
+      </Paper>
+    </>
+  );
+}

src/app_modules/admin/donasi/detail/detail_reject.tsx

@@ -25,22 +25,26 @@ import { NotifBerhasil } from "@/app_modules/donasi/component/notifikasi/notif_b
 import { NotifGagal } from "@/app_modules/donasi/component/notifikasi/notif_gagal";
 import { AdminDonasi_getOneById } from "../fun/get/get_one_by_id";
 import ComponentGlobal_InputCountDown from "@/app_modules/component_global/input_countdown";
+import ComponentGlobalAdmin_BackButton from "../../component_global/back_button";
+import ComponentAdminDonasi_TampilanDetailDonasi from "../component/tampilan_detail_donasi";
+import ComponentAdminDonasi_CeritaPenggalangDana from "../component/tampilan_detail_cerita";
 
 export default function AdminDonasi_DetailReject({
   dataReject,
 }: {
   dataReject: MODEL_DONASI;
 }) {
-  const [donasi, setDonasi] = useState(dataReject);
+  const [data, setData] = useState(dataReject);
 
   return (
     <>
       <Stack>
         <ButtonOnHeader
-          catatan={donasi.catatan}
-          donasiId={donasi.id}
-          setDonasi={setDonasi}
+          catatan={data.catatan}
+          donasiId={data.id}
+          setDonasi={setData}
         />
+          <CatatanReject catatan={data.catatan} />
         <SimpleGrid
           cols={2}
           spacing="lg"
@@ -50,8 +54,10 @@ export default function AdminDonasi_DetailReject({
             { maxWidth: "xs", cols: 1, spacing: "xs" },
           ]}
         >
-          <TampilanDetailDonasi donasi={donasi} />
-          <CatatanReject catatan={donasi.catatan} />
+          <ComponentAdminDonasi_TampilanDetailDonasi donasi={data} />
+          <ComponentAdminDonasi_CeritaPenggalangDana
+            cerita={data.CeritaDonasi}
+          />
         </SimpleGrid>
       </Stack>
     </>
@@ -88,12 +94,12 @@ function ButtonOnHeader({
     <>
       <Stack>
         <Group position="apart">
-          <ComponentAdminDonasi_TombolKembali />
+          <ComponentGlobalAdmin_BackButton />
           <Button radius={"xl"} bg={"orange"} color="orange" onClick={open}>
             Tambah catatan
           </Button>
         </Group>
-        <Divider />
+
       </Stack>
 
       <Modal
@@ -188,10 +194,12 @@ function TampilanDetailDonasi({ donasi }: { donasi: MODEL_DONASI }) {
 function CatatanReject({ catatan }: { catatan: string }) {
   return (
     <>
-      <Stack>
-        <Title order={6}>Alasan Penolakan</Title>
-        <Text>{catatan}</Text>
-      </Stack>
+      <Paper p={"md"} bg={"gray.1"}>
+        <Stack>
+          <Title order={5} >Alasan Penolakan :</Title>
+          <Text>{catatan}</Text>
+        </Stack>
+      </Paper>
     </>
   );
 }

src/app_modules/admin/donasi/detail/detail_review.tsx

@@ -1,44 +1,40 @@
 "use client";
 
+import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
+import ComponentGlobal_InputCountDown from "@/app_modules/component_global/input_countdown";
+import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
+import {
+  MODEL_CERITA_DONASI,
+  MODEL_DONASI,
+} from "@/app_modules/donasi/model/interface";
 import {
   AspectRatio,
+  Box,
   Button,
   Divider,
   Group,
   Image,
   Modal,
   Paper,
-  Progress,
   SimpleGrid,
   Stack,
   Text,
-  TextInput,
   Textarea,
   Title,
 } from "@mantine/core";
-import ComponentAdminDonasi_TombolKembali from "../component/tombol_kembali";
-import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
-import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
-import {
-  MODEL_CERITA_DONASI,
-  MODEL_DONASI,
-} from "@/app_modules/donasi/model/interface";
-import { useState } from "react";
-import { useRouter } from "next/navigation";
 import { useDisclosure } from "@mantine/hooks";
-import { AdminDonasi_funUpdateStatusPublish } from "../fun/update/fun_status_publish";
-import { NotifBerhasil } from "@/app_modules/donasi/component/notifikasi/notif_berhasil";
-import { NotifPeringatan } from "@/app_modules/donasi/component/notifikasi/notif_peringatan";
-import toast from "react-simple-toasts";
-import { AdminDonasi_funUpdateStatusReject } from "../fun/update/fun_status_reject";
-import _ from "lodash";
-import { NotifGagal } from "@/app_modules/donasi/component/notifikasi/notif_gagal";
-import { ComponentGlobalAdmin_NotifikasiPeringatan } from "../../component/admin_notifikasi/notifikasi_peringatan";
-import ComponentGlobal_InputCountDown from "@/app_modules/component_global/input_countdown";
-import { ComponentGlobalAdmin_NotifikasiBerhasil } from "../../component/admin_notifikasi/notifikasi_berhasil";
-import { ComponentGlobalAdmin_NotifikasiGagal } from "../../component/admin_notifikasi/notifikasi_gagal";
-import adminDonasi_getListReview from "../fun/get/get_list_review";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import { ComponentGlobalAdmin_NotifikasiBerhasil } from "../../component_global/admin_notifikasi/notifikasi_berhasil";
+import { ComponentGlobalAdmin_NotifikasiGagal } from "../../component_global/admin_notifikasi/notifikasi_gagal";
+import { ComponentGlobalAdmin_NotifikasiPeringatan } from "../../component_global/admin_notifikasi/notifikasi_peringatan";
+import ComponentAdminDonasi_TombolKembali from "../component/tombol_kembali";
 import { AdminDonasi_getOneById } from "../fun/get/get_one_by_id";
+import { AdminDonasi_funUpdateStatusPublish } from "../fun/update/fun_status_publish";
+import { AdminDonasi_funUpdateStatusReject } from "../fun/update/fun_status_reject";
+import ComponentGlobalAdmin_BackButton from "../../component_global/back_button";
+import ComponentAdminDonasi_TampilanDetailDonasi from "../component/tampilan_detail_donasi";
+import ComponentAdminDonasi_CeritaPenggalangDana from "../component/tampilan_detail_cerita";
 
 export default function AdminDonasi_DetailReview({
   dataReview,
@@ -60,8 +56,10 @@ export default function AdminDonasi_DetailReview({
             { maxWidth: "xs", cols: 1, spacing: "xs" },
           ]}
         >
-          <TampilanDetailDonasi donasi={data} />
-          <CeritaPenggalangDana cerita={data.CeritaDonasi} />
+          <ComponentAdminDonasi_TampilanDetailDonasi donasi={data} />
+          <ComponentAdminDonasi_CeritaPenggalangDana
+            cerita={data.CeritaDonasi}
+          />
         </SimpleGrid>
       </Stack>
     </>
@@ -124,7 +122,7 @@ function ButtonOnHeader({
   return (
     <>
       <Group position="apart">
-        <ComponentAdminDonasi_TombolKembali />
+        <ComponentGlobalAdmin_BackButton />
         {donasi.donasiMaster_StatusDonasiId === "2" ? (
           <Group>
             <Button
@@ -143,7 +141,7 @@ function ButtonOnHeader({
           ""
         )}
       </Group>
-      <Divider />
+      {/* <Divider /> */}
 
       <Modal
         opened={opened}
@@ -193,64 +191,4 @@ function ButtonOnHeader({
   );
 }
 
-function TampilanDetailDonasi({ donasi }: { donasi: MODEL_DONASI }) {
-  return (
-    <>
-      <Paper radius={"md"} p={"md"}>
-        <Stack>
-          <Stack>
-            <AspectRatio ratio={16 / 9}>
-              <Paper radius={"md"}>
-                <Image
-                  alt="Foto"
-                  src={RouterDonasi.api_gambar + `${donasi.imagesId}`}
-                />
-              </Paper>
-            </AspectRatio>
-            <Stack spacing={0}>
-              <Title order={4}>{donasi.title}</Title>
-              <Text fz={"xs"}>
-                Durasi: {donasi.DonasiMaster_Durasi.name} hari
-              </Text>
-            </Stack>
 
-            <Stack spacing={0}>
-              <Group>
-                <Text fz={12}>Dana dibutuhkan</Text>
-                <Title order={4} c="blue">
-                  <TampilanRupiahDonasi nominal={+donasi.target} />
-                </Title>
-              </Group>
-              <Group>
-                <Text fz={12}>Kategori</Text>
-                <Title order={4} c="blue">
-                  {donasi.DonasiMaster_Ketegori.name}
-                </Title>
-              </Group>
-            </Stack>
-          </Stack>
-        </Stack>
-      </Paper>
-    </>
-  );
-}
-
-function CeritaPenggalangDana({ cerita }: { cerita: MODEL_CERITA_DONASI }) {
-  return (
-    <>
-      <Stack>
-        <Title order={5}>Cerita Penggalang Dana</Title>
-        <Text>{cerita.pembukaan}</Text>
-        <AspectRatio ratio={16 / 9}>
-          <Paper radius={"md"}>
-            <Image
-              alt="Foto"
-              src={RouterDonasi.api_gambar_cerita + `${cerita.imagesId}`}
-            />
-          </Paper>
-        </AspectRatio>
-        <Text>{cerita.cerita}</Text>
-      </Stack>
-    </>
-  );
-}

src/app_modules/admin/donasi/detail/publish/detail_publish.tsx

@@ -43,18 +43,18 @@ import {
 import { useState } from "react";
 import { RouterAdminDonasi_OLD } from "@/app/lib/router_hipmi/router_admin";
 import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
-import _ from "lodash";
+import _, { toNumber } from "lodash";
 import { useRouter } from "next/navigation";
 import { useDisclosure, useInterval, useShallowEffect } from "@mantine/hooks";
 import { Donasi_getOneById } from "@/app_modules/donasi/fun/get/get_one_donasi_by_id";
 import { AdminDonasi_getOneById } from "../../fun/get/get_one_by_id";
-import ComponentGlobalAdmin_BackButton from "@/app_modules/admin/component/back_button";
+import ComponentGlobalAdmin_BackButton from "@/app_modules/admin/component_global/back_button";
 import { MODEL_NEW_DEFAULT_MASTER } from "@/app_modules/model_global/interface";
 import { adminDonasi_getListDonatur } from "../../fun/get/get_list_donatur_by_id";
 import { RouterAdminDonasi } from "@/app/lib/router_admin/router_admin_donasi";
 import adminDonasi_funUpdateStatusDanTotal from "../../fun/update/fun_update_status_dan_total";
-import { ComponentGlobalAdmin_NotifikasiBerhasil } from "@/app_modules/admin/component/admin_notifikasi/notifikasi_berhasil";
-import { ComponentGlobalAdmin_NotifikasiGagal } from "@/app_modules/admin/component/admin_notifikasi/notifikasi_gagal";
+import { ComponentGlobalAdmin_NotifikasiBerhasil } from "@/app_modules/admin/component_global/admin_notifikasi/notifikasi_berhasil";
+import { ComponentGlobalAdmin_NotifikasiGagal } from "@/app_modules/admin/component_global/admin_notifikasi/notifikasi_gagal";
 
 export default function AdminDonasi_DetailPublish({
   dataPublish,
@@ -130,37 +130,37 @@ function TampilanDetailDonasi({
                   // mah={500}
                   // mx={"auto"}
                   alt="Foto"
-                  src={RouterDonasi.api_gambar + `${donasi.imagesId}`}
+                  src={RouterDonasi.api_gambar + `${donasi?.imagesId}`}
                 />
               </AspectRatio>
             </Paper>
 
             <Paper withBorder p={"sm"}>
               <Stack spacing={5}>
-                <Title order={4}>{donasi.title}</Title>
+                <Title order={4}>{donasi?.title}</Title>
                 <Group>
                   <Text fz={"xs"}>Penggalang Dana</Text>
                   <Title order={5} c="blue">
-                    {donasi.Author.username}
+                    {donasi?.Author.username}
                   </Title>
                 </Group>
                 <Group>
                   <Text fz={12}>Durasi</Text>
                   <Title order={5} c="blue">
-                    {donasi.DonasiMaster_Durasi.name} hari
+                    {donasi?.DonasiMaster_Durasi.name} hari
                   </Title>
                 </Group>
 
                 <Group>
                   <Text fz={12}>Dana dibutuhkan</Text>
                   <Title order={5} c="blue">
-                    <TampilanRupiahDonasi nominal={+donasi.target} />
+                    <TampilanRupiahDonasi nominal={+donasi?.target} />
                   </Title>
                 </Group>
                 <Group>
                   <Text fz={12}>Kategori</Text>
                   <Title order={5} c="blue">
-                    {donasi.DonasiMaster_Ketegori.name}
+                    {donasi?.DonasiMaster_Ketegori?.name}
                   </Title>
                 </Group>
                 <Group>
@@ -172,13 +172,13 @@ function TampilanDetailDonasi({
                 <Group>
                   <Text fz={12}>Progres</Text>
                   <Title order={5} c="blue">
-                    {donasi.progres} %
+                    {toNumber(donasi.progres).toFixed(2)} %
                   </Title>
                 </Group>
                 <Group>
                   <Text fz={12}>Dana terkumpul</Text>
                   <Title order={5} c="blue">
-                    <TampilanRupiahDonasi nominal={+donasi.terkumpul} />
+                    <TampilanRupiahDonasi nominal={+donasi?.terkumpul} />
                   </Title>
                 </Group>
                 {/* <Button w={200} bg={"green.5"} color="green">Pencairan Dana</Button> */}
@@ -196,7 +196,7 @@ function TampilanDetailDonasi({
                       <Text fz={"xs"}>Total Dana Dicairkan</Text>
                       <Title>
                         <TampilanRupiahDonasi
-                          nominal={donasi.totalPencairan}
+                          nominal={donasi?.totalPencairan}
                           fontSize={14}
                         />
                       </Title>
@@ -205,7 +205,7 @@ function TampilanDetailDonasi({
                   <Grid.Col span={"auto"}>
                     <Stack spacing={0}>
                       <Text fz={"xs"}>Bank Tujuan</Text>
-                      <Title order={6}>{donasi.namaBank}</Title>
+                      <Title order={6}>{donasi?.namaBank}</Title>
                     </Stack>
                   </Grid.Col>
                 </Grid>
@@ -213,13 +213,13 @@ function TampilanDetailDonasi({
                   <Grid.Col span={"auto"}>
                     <Stack spacing={0}>
                       <Text fz={"xs"}>Akumulasi Pencairan</Text>
-                      <Title order={6}>{donasi.akumulasiPencairan} Kali</Title>
+                      <Title order={6}>{donasi?.akumulasiPencairan} Kali</Title>
                     </Stack>
                   </Grid.Col>
                   <Grid.Col span={"auto"}>
                     <Stack spacing={0}>
                       <Text fz={"xs"}>Nomor Rekening</Text>
-                      <Title order={6}>{donasi.rekening}</Title>
+                      <Title order={6}>{donasi?.rekening}</Title>
                     </Stack>
                   </Grid.Col>
                 </Grid>
@@ -228,7 +228,7 @@ function TampilanDetailDonasi({
                   radius={"xl"}
                   onClick={() =>
                     router.push(
-                      RouterAdminDonasi_OLD.pencairan_dana + `${donasi.id}`
+                      RouterAdminDonasi_OLD.pencairan_dana + `${donasi?.id}`
                     )
                   }
                 >
@@ -569,17 +569,25 @@ function TampilanListPencairan({
 }: {
   pencairan: MODEL_DONASI_PENCAIRAN_DANA[];
 }) {
+  const router = useRouter();
+  const [data, setData] = useState(pencairan);
   const [opened, { open, close }] = useDisclosure(false);
   const [gambarId, setGambarId] = useState("");
 
-  const rowTable = pencairan.map((e) => (
+  const rowTable = data.map((e) => (
     <tr key={e.id}>
       <td>
-        <TampilanRupiahDonasi nominal={e.nominalCair} />
+        <Center>
+          <TampilanRupiahDonasi nominal={e.nominalCair} />
+        </Center>
       </td>
-      <td>{moment(e.createdAt).format("ll")}</td>
       <td>
-        <Text>{e.title}</Text>
+        <Center>{moment(e.createdAt).format("ll")}</Center>
+      </td>
+      <td>
+        <Center>
+          <Text>{e.title}</Text>
+        </Center>
       </td>
       <td width={500}>
         <Box w={"100%"}>
@@ -589,42 +597,119 @@ function TampilanListPencairan({
         </Box>
       </td>
       <td>
-        {
-          <Box>
-            <Center>
-              <Button
-                radius={"xl"}
-                compact
-                bg={"green"}
-                color="green"
-                onClick={() => {
-                  open();
-                  setGambarId(e.imagesId);
-                }}
-              >
-                Detail
-              </Button>
-            </Center>
-          </Box>
-        }
+        <Box>
+          <Center>
+            <Button
+              radius={"xl"}
+              bg={"green"}
+              color="green"
+              onClick={() => {
+                // open();
+                // setGambarId(e.imagesId);
+                router.push(
+                  RouterAdminDonasi.transfer_invoice_reimbursement + e?.imagesId
+                );
+              }}
+            >
+              Cek
+            </Button>
+          </Center>
+        </Box>
       </td>
     </tr>
   ));
 
   return (
     <>
-      <Modal opened={opened} onClose={close} centered>
+      {/* <Modal opened={opened} onClose={close} centered>
         <AspectRatio ratio={9 / 16}>
           <Image
             src={RouterDonasi.api_gambar_pencairan + `${gambarId}`}
             alt="Foto"
           />
         </AspectRatio>
-      </Modal>
+      </Modal> */}
 
-      <Stack p={"md"}>
+      {/* <pre>{JSON.stringify(data, null, 2)}</pre> */}
+
+      <Stack spacing={"xs"} h={"100%"}>
+        <Group
+          position="apart"
+          bg={"gray.4"}
+          p={"xs"}
+          style={{ borderRadius: "6px" }}
+        >
+          <Title order={4}>Rincian Pencairan Dana</Title>
+          <Group>
+            <ActionIcon
+              size={"lg"}
+              radius={"xl"}
+              variant="light"
+              onClick={() => {
+                // onRelaod();
+              }}
+            >
+              <IconReload />
+            </ActionIcon>
+            {/* <Select
+              placeholder="Pilih status"
+              value={isSelect}
+              data={listMasterStatus.map((e) => ({
+                value: e.id,
+                label: e.name,
+              }))}
+              onChange={(val) => {
+                onSelect(val);
+              }}
+            /> */}
+          </Group>
+        </Group>
+
+        <Paper p={"md"} withBorder shadow="lg" h={"80vh"}>
+          <ScrollArea w={"100%"} h={"90%"}>
+            <Table
+              verticalSpacing={"xl"}
+              horizontalSpacing={"md"}
+              p={"md"}
+              w={1500}
+              striped
+              highlightOnHover
+            >
+              <thead>
+                <tr>
+                  <th>
+                    <Center>Nominal</Center>
+                  </th>
+                  <th>
+                    <Center>Tanggal</Center>
+                  </th>
+                  <th>
+                    <Center>Judul</Center>
+                  </th>
+                  <th>Deskripsi</th>
+                  <th>
+                    <Center>Bukti Transfer</Center>
+                  </th>
+                </tr>
+              </thead>
+              <tbody>{rowTable}</tbody>
+            </Table>
+          </ScrollArea>
+
+          {/* <Center mt={"xl"}>
+            <Pagination
+              value={isActivePage}
+              total={isNPage}
+              onChange={(val) => {
+                onPageClick(val);
+              }}
+            />
+          </Center> */}
+        </Paper>
+      </Stack>
+
+      {/* <Stack p={"md"}>
         <Title order={3}>Rincian Pencairan Dana</Title>
-        {/* <pre>{JSON.stringify(pencairan, null, 2)}</pre> */}
         {_.isEmpty(pencairan) ? (
           <Paper bg={"gray.1"} p={"xs"}>
             <Center>BELUM ADA PENCAIRAN DANA</Center>
@@ -649,7 +734,7 @@ function TampilanListPencairan({
             </Table>
           </Paper>
         )}
-      </Stack>
+      </Stack> */}
     </>
   );
 }

src/app_modules/admin/donasi/detail/publish/pencairan_dana.tsx

@@ -1,36 +1,115 @@
 "use client";
 
+import ComponentAdminGlobal_TampilanRupiahDonasi from "@/app_modules/admin/component_global/tampilan_rupiah";
+import ComponentDonasi_NotedBox from "@/app_modules/donasi/component/noted_box";
+import { NotifBerhasil } from "@/app_modules/donasi/component/notifikasi/notif_berhasil";
+import { NotifGagal } from "@/app_modules/donasi/component/notifikasi/notif_gagal";
+import { NotifPeringatan } from "@/app_modules/donasi/component/notifikasi/notif_peringatan";
 import {
   AspectRatio,
   Button,
   Center,
   FileButton,
   Image,
-  NumberInput,
   Paper,
   Stack,
+  Text,
   TextInput,
   Textarea,
   Title,
 } from "@mantine/core";
-import ComponentAdminDonasi_TombolKembali from "../../component/tombol_kembali";
-import { useState } from "react";
 import { IconCamera } from "@tabler/icons-react";
-import ComponentDonasi_NotedBox from "@/app_modules/donasi/component/noted_box";
-import { useRouter } from "next/navigation";
+import _, { toNumber } from "lodash";
 import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
-import { MODEL_DONASI_PENCAIRAN_DANA } from "@/app_modules/donasi/model/interface";
-import _ from "lodash";
-import { NotifPeringatan } from "@/app_modules/donasi/component/notifikasi/notif_peringatan";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import ComponentAdminDonasi_TombolKembali from "../../component/tombol_kembali";
 import { AdminDonasi_funCreatePencairanDana } from "../../fun/create/fun_create_pencairan_dana";
-import { NotifBerhasil } from "@/app_modules/donasi/component/notifikasi/notif_berhasil";
-import { NotifGagal } from "@/app_modules/donasi/component/notifikasi/notif_gagal";
 import { AdminDonasi_AkumulasiPencairanById } from "../../fun/update/fun_update_akumulasi_pencairan";
+import ComponentGlobal_ErrorInput from "@/app_modules/component_global/error_input";
+import { ComponentGlobalAdmin_NotifikasiPeringatan } from "@/app_modules/admin/component_global/admin_notifikasi/notifikasi_peringatan";
+import { ComponentGlobalAdmin_NotifikasiBerhasil } from "@/app_modules/admin/component_global/admin_notifikasi/notifikasi_berhasil";
+import { ComponentGlobalAdmin_NotifikasiGagal } from "@/app_modules/admin/component_global/admin_notifikasi/notifikasi_gagal";
+import { AdminDonasi_getOneById } from "../../fun/get/get_one_by_id";
 
 export default function AdminDonasi_PencairanDana({
   donasiId,
+  danaTerkumpul,
+  totalPencairan,
 }: {
   donasiId: string;
+  danaTerkumpul: string;
+  totalPencairan: number;
+}) {
+  const [terkumpul, setTerkumpul] = useState(danaTerkumpul);
+  const [total, setTotal] = useState(totalPencairan);
+
+  return (
+    <>
+      <Stack>
+        <ComponentAdminDonasi_TombolKembali />
+        <TotalDanaView danaTerkumpul={terkumpul} totalPencairan={total} />
+        <FormView
+          danaTerkumpul={terkumpul}
+          donasiId={donasiId}
+          totalPencairan={total}
+          onSuccess={(val) => {
+            setTerkumpul(val.terkumpul);
+            setTotal(val.totalPencairan);
+            console.log(val)
+          }}
+        />
+      </Stack>
+    </>
+  );
+}
+
+function TotalDanaView({
+  danaTerkumpul,
+  totalPencairan,
+}: {
+  danaTerkumpul: string;
+  totalPencairan: number;
+}) {
+  const terkumpul = toNumber(danaTerkumpul);
+  const sisaDana = terkumpul - totalPencairan;
+
+  return (
+    <>
+      <Center>
+        <Paper
+          p={"md"}
+          w={{ base: 200, sm: 200, md: 300, lg: 400 }}
+          withBorder
+          bg={"gray.2"}
+        >
+          <Stack spacing={0} align="center">
+            <Text fw={"bold"}>Dana Tersisa</Text>
+            <Title>
+              {
+                <ComponentAdminGlobal_TampilanRupiahDonasi
+                  nominal={sisaDana}
+                  fontSize={20}
+                />
+              }
+            </Title>
+          </Stack>
+        </Paper>
+      </Center>
+    </>
+  );
+}
+
+function FormView({
+  donasiId,
+  danaTerkumpul,
+  totalPencairan,
+  onSuccess,
+}: {
+  donasiId: string;
+  danaTerkumpul: string;
+  totalPencairan: number;
+  onSuccess: (val: any) => void;
 }) {
   const router = useRouter();
   const [file, setFile] = useState<File | null>(null);
@@ -40,136 +119,197 @@ export default function AdminDonasi_PencairanDana({
     deskripsi: "",
     nilai: "",
   });
+  const [nilaiNominal, setNilaiNominal] = useState(0);
+  const [isOver, setIsOver] = useState(false);
+
+  const terkumpul = toNumber(danaTerkumpul);
+  const sisaDana = terkumpul - totalPencairan;
+
   return (
     <>
-      <Stack>
-        <ComponentAdminDonasi_TombolKembali />
-        <Center>
-          <Paper
-            p={"md"}
-            w={{ base: 200, sm: 200, md: 300, lg: 400 }}
-            withBorder
-          >
-            <Center mb={"lg"}>
-              <Title order={5}>Form Pencairan Dana</Title>
-            </Center>
-            <Stack>
-              <TextInput
-                withAsterisk
-                type="number"
-                placeholder="Masukan jumlah nominal"
-                label="Nominal"
-                onChange={(val) => {
-                  setValue({
-                    ...value,
-                    nilai: val.target.value,
-                  });
-                }}
-              />
-              <TextInput
-                withAsterisk
-                placeholder="Masukan judul"
-                label="Judul"
-                onChange={(val: any) => {
-                  setValue({
-                    ...value,
-                    title: val.target.value,
-                  });
-                }}
-              />
-              <Textarea
-                withAsterisk
-                placeholder="Masukan deskripsi"
-                label="Deskripsi"
-                onChange={(val: any) => {
-                  setValue({
-                    ...value,
-                    deskripsi: val.target.value,
-                  });
-                }}
-              />
-
-              <ComponentDonasi_NotedBox informasi="Wajib menyertakan bukti transfer" />
-              <Stack>
-                <Center>
-                  <FileButton
-                    onChange={async (files: any | null) => {
-                      try {
-                        const buffer = URL.createObjectURL(
-                          new Blob([new Uint8Array(await files.arrayBuffer())])
-                        );
-                        // console.log(buffer, "ini buffer");
-                        // console.log(files, " ini file");
-                        setImages(buffer);
-                        setFile(files);
-                      } catch (error) {
-                        console.log(error);
-                      }
-                    }}
-                    accept="image/png,image/jpeg"
-                  >
-                    {(props) => (
-                      <Button
-                        {...props}
-                        radius={"xl"}
-                        variant="outline"
-                        w={150}
-                        leftIcon={<IconCamera />}
-                        compact
-                      >
-                        Upload
-                      </Button>
-                    )}
-                  </FileButton>
-                </Center>
-                {images ? (
-                  <AspectRatio ratio={9 / 16}>
-                    <Paper radius={"md"} withBorder>
-                      <Image
-                        alt="Foto"
-                        src={images}
-                      />
-                    </Paper>
-                  </AspectRatio>
+      <Center>
+        <Paper p={"md"} w={{ base: 200, sm: 200, md: 300, lg: 400 }} withBorder>
+          <Center mb={"lg"}>
+            <Title order={5}>Form Pencairan Dana</Title>
+          </Center>
+          <Stack>
+            <TextInput
+              icon={<Text fw={"bold"}>Rp.</Text>}
+              withAsterisk
+              placeholder="0"
+              label="Nominal"
+              maxLength={sisaDana.toLocaleString().length}
+              error={
+                isOver ? (
+                  <ComponentGlobal_ErrorInput text="Nominal melebihi sisa dana" />
                 ) : (
                   ""
-                )}
-              </Stack>
-              <Button
-                radius={"xl"}
-                mt={"lg"}
-                onClick={
-                  () => onSave(router, value, donasiId, file as any)
-                  // console.log(value)
+                )
+              }
+              value={value.nilai}
+              onChange={(val) => {
+                // const nilai = val.currentTarget.value;
+                // const nilaiTypeNumber = toNumber(val.currentTarget.value);
+
+                // if (nilaiTypeNumber > sisaDana) {
+                //   console.log("lebih");
+                // } else {
+                //   console.log("kurang");
+                // }
+
+                const match = val.currentTarget.value
+                  .replace(/\./g, "")
+                  .match(/^[0-9]+$/);
+
+                if (val.currentTarget.value === "")
+                  return setValue({
+                    ...value,
+                    nilai: "",
+                  });
+
+                if (!match?.[0]) return null;
+
+                const nilai = val.currentTarget.value.replace(/\./g, "");
+                const target = Intl.NumberFormat("id-ID").format(+nilai);
+
+                if (+nilai > sisaDana) {
+                  setIsOver(true);
+                } else {
+                  setIsOver(false);
                 }
-              >
-                Simpan
-              </Button>
+                setNilaiNominal(+nilai);
+                setValue({
+                  ...value,
+                  nilai: target,
+                });
+              }}
+            />
+            <TextInput
+              withAsterisk
+              placeholder="Masukan judul"
+              label="Judul"
+              maxLength={100}
+              onChange={(val: any) => {
+                setValue({
+                  ...value,
+                  title: val.target.value,
+                });
+              }}
+            />
+            <Textarea
+              withAsterisk
+              placeholder="Masukan deskripsi"
+              label="Deskripsi"
+              maxLength={300}
+              onChange={(val: any) => {
+                setValue({
+                  ...value,
+                  deskripsi: val.target.value,
+                });
+              }}
+            />
+
+            <ComponentDonasi_NotedBox informasi="Wajib menyertakan bukti transfer" />
+            <Stack>
+              <Center>
+                <FileButton
+                  onChange={async (files: any | null) => {
+                    try {
+                      const buffer = URL.createObjectURL(
+                        new Blob([new Uint8Array(await files.arrayBuffer())])
+                      );
+                      // console.log(buffer, "ini buffer");
+                      // console.log(files, " ini file");
+                      setImages(buffer);
+                      setFile(files);
+                    } catch (error) {
+                      console.log(error);
+                    }
+                  }}
+                  accept="image/png,image/jpeg"
+                >
+                  {(props) => (
+                    <Button
+                      {...props}
+                      radius={"xl"}
+                      variant="outline"
+                      w={150}
+                      leftIcon={<IconCamera />}
+                      compact
+                    >
+                      Upload
+                    </Button>
+                  )}
+                </FileButton>
+              </Center>
+              {images ? (
+                <AspectRatio ratio={9 / 16}>
+                  <Paper radius={"md"} withBorder>
+                    <Image alt="Foto" src={images} />
+                  </Paper>
+                </AspectRatio>
+              ) : (
+                ""
+              )}
             </Stack>
-          </Paper>
-        </Center>
-      </Stack>
+            <Button
+              disabled={
+                _.values(value).includes("") || file === null || isOver
+                  ? true
+                  : false
+              }
+              style={{ transition: "0.5s" }}
+              radius={"xl"}
+              mt={"lg"}
+              onClick={() =>
+                onSave({
+                  router: router,
+                  value: value,
+                  donasiId: donasiId,
+                  file: file as any,
+                  nilaiNominal: nilaiNominal,
+                  onSuccess1: (val: any) => onSuccess(val),
+                })
+              }
+            >
+              Simpan
+            </Button>
+          </Stack>
+        </Paper>
+      </Center>
     </>
   );
 }
 
-async function onSave(
-  router: AppRouterInstance,
-  value: any,
-  donasiId: string,
-  file: FormData
-) {
+async function onSave({
+  router,
+  value,
+  donasiId,
+  file,
+  nilaiNominal,
+
+  onSuccess1,
+}: {
+  router: AppRouterInstance;
+  value: any;
+  donasiId: string;
+  file: FormData;
+  nilaiNominal: number;
+  onSuccess1: (val: any) => void;
+}) {
   const body = {
     donasiId: donasiId,
-    nominalCair: value.nilai,
+    nominalCair: nilaiNominal,
     title: value.title,
     deskripsi: value.deskripsi,
   };
 
-  //   console.log(body);
-
-  if (_.values(body).includes("")) return NotifPeringatan("Lengkapi Data");
-  if (!file) return NotifPeringatan("Lampirkan Bukti Transfer");
+  if (_.values(body).includes(""))
+    return ComponentGlobalAdmin_NotifikasiPeringatan("Lengkapi Data");
+  if (!file)
+    return ComponentGlobalAdmin_NotifikasiPeringatan(
+      "Lampirkan Bukti Transfer"
+    );
 
   const gambar = new FormData();
   gambar.append("file", file as any);
@@ -180,12 +320,13 @@ async function onSave(
         await AdminDonasi_AkumulasiPencairanById(
           body.donasiId as any,
           body.nominalCair as any
-        ).then((res) => {
+        ).then(async (res) => {
           if (res.status === 200) {
-            NotifBerhasil(res.message);
-            router.back();
+            const loadData = await AdminDonasi_getOneById(donasiId);
+            onSuccess1(loadData);
+            ComponentGlobalAdmin_NotifikasiBerhasil(res.message);
           } else {
-            NotifGagal(res.message);
+            ComponentGlobalAdmin_NotifikasiGagal(res.message);
           }
         });
       } else {

src/app_modules/admin/donasi/fun/delete/fun_delete_by_id.ts

@@ -7,15 +7,17 @@ import { revalidatePath } from "next/cache";
 
 export default async function adminDonasi_funDeleteKategori({
   kategoriId,
+  isActive,
 }: {
   kategoriId: string;
+  isActive: boolean;
 }) {
   const del = await prisma.donasiMaster_Kategori.update({
     where: {
       id: kategoriId,
     },
     data: {
-      active: false,
+      active: isActive,
     },
   });
 

src/app_modules/admin/donasi/fun/get/get_list_pencairan_dana_by_id.ts

@@ -1,13 +1,16 @@
-"use server"
+"use server";
 
-import prisma from "@/app/lib/prisma"
+import prisma from "@/app/lib/prisma";
 
-export async function AdminDonasi_getListPencairanDana(donasiId:string) {
-    const data = await prisma.donasi_PencairanDana.findMany({
-        where: {
-            donasiId: donasiId
-        }
-    })
+export async function AdminDonasi_getListPencairanDana(donasiId: string) {
+  const data = await prisma.donasi_PencairanDana.findMany({
+    orderBy: {
+      createdAt: "desc",
+    },
+    where: {
+      donasiId: donasiId,
+    },
+  });
 
-    return data
-}
+  return data;
+}

src/app_modules/admin/donasi/fun/get/get_one_by_id.ts

@@ -33,6 +33,7 @@ export async function AdminDonasi_getOneById(id: string) {
       DonasiMaster_Ketegori: true,
       DonasiMaster_Durasi: true,
       DonasiMaster_Status: true,
+      
     },
   });
   return res;

src/app_modules/admin/donasi/fun/master/get_list_kategori.ts

@@ -7,9 +7,7 @@ export default async function adminDonasi_getMasterKategori() {
     orderBy: {
       createdAt: "asc",
     },
-    where: {
-      active: true,
-    },
+
   });
   return data;
 }

src/app_modules/admin/donasi/index.tsx

@@ -9,7 +9,7 @@ import AdminDonasi_ProsesTransaksi from "./detail/publish/proses_transaksi";
 import AdminDonasi_PencairanDana from "./detail/publish/pencairan_dana";
 import AdminDonasi_TableKategori from "./sub_menu/table_kategori";
 import AdminDonasi_BuktiTransfer from "./sub-detail/bukti_transfer";
-
+import AdminDonasi_BuktiTransferPencairan from "./sub-detail/bukti_transfer_pencairan";
 
 export {
   AdminDonasi_Main,
@@ -23,5 +23,5 @@ export {
   AdminDonasi_PencairanDana,
   AdminDonasi_TableKategori,
   AdminDonasi_BuktiTransfer,
-
+  AdminDonasi_BuktiTransferPencairan,
 };

src/app_modules/admin/donasi/main/index.tsx

@@ -15,7 +15,7 @@ import {
 } from "@mantine/core";
 import { IconChevronsRight } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 
 export default function AdminDonasi_Main({
   countPublish,

src/app_modules/admin/donasi/sub-detail/bukti_transfer.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { AspectRatio, Box, Image, Paper, Stack } from "@mantine/core";
-import ComponentGlobalAdmin_BackButton from "../../component/back_button";
+import ComponentGlobalAdmin_BackButton from "../../component_global/back_button";
 import { RouterAdminDonasi_OLD } from "@/app/lib/router_hipmi/router_admin";
 
 export default function AdminDonasi_BuktiTransfer({

src/app_modules/admin/donasi/sub-detail/bukti_transfer_pencairan.tsx

@@ -0,0 +1,48 @@
+"use client";
+
+import { AspectRatio, Box, Image, Paper, Stack } from "@mantine/core";
+import ComponentGlobalAdmin_BackButton from "../../component_global/back_button";
+import { RouterAdminDonasi_OLD } from "@/app/lib/router_hipmi/router_admin";
+import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
+
+export default function AdminDonasi_BuktiTransferPencairan({
+  imageId,
+}: {
+  imageId: string;
+}) {
+  return (
+    <>
+      <Stack>
+        <ComponentGlobalAdmin_BackButton />
+        <BuktiTransfer imageId={imageId} />
+      </Stack>
+    </>
+  );
+}
+
+function BuktiTransfer({ imageId }: { imageId: string }) {
+  return (
+    <>
+      <Paper withBorder p={"lg"} bg={"gray.3"}>
+        <AspectRatio ratio={2 / 1} mx="auto">
+          <Image
+            alt="Foto"
+            src={RouterDonasi.api_gambar_pencairan + `${imageId}`}
+          />
+        </AspectRatio>
+        {/* <AspectRatio ratio={1 / 1} mah={500} p={"lg"} bg={"cyan"}>
+          <Paper bg={"grape"} h={"100%"}>
+            <Image
+            //   height={500}
+            //   width={"100%"}
+              alt="Foto"
+              src={
+                RouterAdminDonasi_OLD.api_gambar_bukti_transfer + `${imageId}`
+              }
+            />
+          </Paper>
+        </AspectRatio> */}
+      </Paper>
+    </>
+  );
+}

src/app_modules/admin/donasi/sub_menu/table_kategori.tsx

@@ -15,51 +15,54 @@ import {
   Text,
   ActionIcon,
   Overlay,
+  Switch,
+  Modal,
 } from "@mantine/core";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import { MODEL_NEW_DEFAULT_MASTER } from "@/app_modules/model_global/interface";
 import { useState } from "react";
-import { IconEdit, IconTrash } from "@tabler/icons-react";
+import { IconCirclePlus, IconEdit, IconTrash } from "@tabler/icons-react";
 import adminDonasi_funCreateKategori from "../fun/create/fun_create_kategori";
-import { ComponentGlobalAdmin_NotifikasiBerhasil } from "../../component/admin_notifikasi/notifikasi_berhasil";
-import { ComponentGlobalAdmin_NotifikasiGagal } from "../../component/admin_notifikasi/notifikasi_gagal";
+import { ComponentGlobalAdmin_NotifikasiBerhasil } from "../../component_global/admin_notifikasi/notifikasi_berhasil";
+import { ComponentGlobalAdmin_NotifikasiGagal } from "../../component_global/admin_notifikasi/notifikasi_gagal";
 import adminDonasi_getMasterKategori from "../fun/master/get_list_kategori";
 import adminDonasi_funDeleteKategori from "../fun/delete/fun_delete_by_id";
 import adminDonasi_funUpdatekategoriById from "../fun/update/fun_update_kategori_by_id";
+import _ from "lodash";
 
 export default function AdminDonasi_TableKategori({
   listKategori,
 }: {
   listKategori: MODEL_NEW_DEFAULT_MASTER[];
 }) {
-  const [list, setList] = useState(listKategori);
-
   return (
     <>
       <Stack h={"100%"}>
         <ComponentAdminGlobal_HeaderTamplate name="Donasi" />
-        <TableView
-          list={list}
-          onLoadData={(val) => {
-            setList(val);
-          }}
-        />
+        <TableView list={listKategori} />
       </Stack>
     </>
   );
 }
 
-function TableView({
-  list,
-  onLoadData,
-}: {
-  list: MODEL_NEW_DEFAULT_MASTER[];
-  onLoadData: (val: any) => void;
-}) {
+function TableView({ list }: { list: MODEL_NEW_DEFAULT_MASTER[] }) {
+  const [data, setData] = useState(list);
+
   const [create, setCreate] = useState("");
-  const [visible, setVisible] = useState(true);
-  const [kategoriId, setKategoriId] = useState("");
-  const [updateName, setUpdateName] = useState("");
+  const [isCreate, setIsCreate] = useState(false);
+
+  // const [kategoriId, setKategoriId] = useState("");
+  const [updateKategori, setUpdateKategori] = useState({
+    kategoriId: "",
+    name: "",
+  });
+  const [isUpdate, setIsUpdate] = useState(false);
+
+  const [updateStatus, setUpdateStatus] = useState({
+    kategoriId: "",
+    isActive: "",
+  });
+  const [isChangeStatus, setIsChangeStatus] = useState(false);
 
   async function onCreateNewKategori() {
     const tambahData = await adminDonasi_funCreateKategori({
@@ -67,7 +70,7 @@ function TableView({
     });
     if (tambahData.status === 200) {
       const loadNewdata = await adminDonasi_getMasterKategori();
-      onLoadData(loadNewdata);
+      setData(loadNewdata);
       setCreate("");
       ComponentGlobalAdmin_NotifikasiBerhasil(tambahData.message);
     } else {
@@ -75,12 +78,18 @@ function TableView({
     }
   }
 
-  async function onDelete(id: string) {
-    const del = await adminDonasi_funDeleteKategori({ kategoriId: id });
+  async function onChangeStatus() {
+    // console.log(updateStatus.kategoriId, updateStatus.isActive);
+    const del = await adminDonasi_funDeleteKategori({
+      kategoriId: updateStatus.kategoriId,
+      isActive: updateStatus.isActive as any,
+    });
+
     if (del.status === 200) {
       const loadNewdata = await adminDonasi_getMasterKategori();
-      onLoadData(loadNewdata);
+      setData(loadNewdata);
       ComponentGlobalAdmin_NotifikasiBerhasil(del.message);
+      setIsChangeStatus(false);
     } else {
       ComponentGlobalAdmin_NotifikasiGagal(del.message);
     }
@@ -88,46 +97,59 @@ function TableView({
 
   async function onUpdate() {
     const updt = await adminDonasi_funUpdatekategoriById({
-      kategoriId: kategoriId,
-      name: updateName,
+      kategoriId: updateKategori.kategoriId,
+      name: updateKategori.name,
     });
     if (updt.status === 200) {
-      setVisible(true);
-      setKategoriId("");
-      setUpdateName("");
+      setUpdateKategori({ kategoriId: "", name: "" });
       ComponentGlobalAdmin_NotifikasiBerhasil(updt.message);
       const loadData = await adminDonasi_getMasterKategori();
-      onLoadData(loadData);
+      setData(loadData);
+      setIsUpdate(false);
     } else {
       ComponentGlobalAdmin_NotifikasiGagal(updt.message);
     }
   }
 
-  const rowTable = list.map((e, i) => (
+  const rowTable = data.map((e, i) => (
     <tr key={i}>
       <td>
         <Center>
           <Text>{e?.name}</Text>
         </Center>
       </td>
+      <td>
+        <Center>
+          <Switch
+            color="orange"
+            onLabel="ON"
+            offLabel="OFF"
+            checked={e?.active}
+            onChange={(val) => {
+              const status = val.currentTarget.checked;
+              setIsChangeStatus(true);
+              setUpdateStatus({
+                kategoriId: e?.id,
+                isActive: status as any,
+              });
+            }}
+          />
+        </Center>
+      </td>
       <td>
         <Group position="center">
           <ActionIcon
             onClick={() => {
-              setVisible(false);
-              setKategoriId(e?.id);
-              setUpdateName(e?.name);
+              setIsUpdate(true);
+              setIsCreate(false);
+              setUpdateKategori({
+                kategoriId: e?.id,
+                name: e?.name,
+              });
             }}
           >
             <IconEdit color="green" />
           </ActionIcon>
-          <ActionIcon
-            onClick={() => {
-              onDelete(e?.id);
-            }}
-          >
-            <IconTrash color="red" />
-          </ActionIcon>
         </Group>
       </td>
     </tr>
@@ -144,84 +166,22 @@ function TableView({
           style={{ borderRadius: "6px" }}
         >
           <Title order={4}>Kategori</Title>
+          <Button
+            w={120}
+            leftIcon={<IconCirclePlus />}
+            radius={"xl"}
+            onClick={() => {
+              setIsCreate(true);
+              setIsUpdate(false);
+            }}
+          >
+            Tambah
+          </Button>
         </Group>
 
         <Grid>
           <Grid.Col span={"auto"}>
-            <Stack>
-              <Paper p={"md"} withBorder>
-                <Stack>
-                  <TextInput
-                    value={create}
-                    label={<Title order={6}>Tambah Kategori</Title>}
-                    placeholder="Masukan kategori baru"
-                    onChange={(val) => {
-                      setCreate(val.currentTarget.value);
-                    }}
-                  />
-                  <Group position="right">
-                    <Button
-                      style={{
-                        transition: "0.5s",
-                      }}
-                      disabled={create === "" ? true : false}
-                      radius={"xl"}
-                      onClick={() => {
-                        onCreateNewKategori();
-                      }}
-                    >
-                      Simpan
-                    </Button>
-                  </Group>
-                </Stack>
-              </Paper>
-
-              <Paper p={"md"} withBorder style={{ transition: "1s" }}>
-                <Stack>
-                  <TextInput
-                    value={updateName}
-                    disabled={visible ? true : false}
-                    label={<Title order={6}>Update Kategori</Title>}
-                    placeholder="Update kategori"
-                    onChange={(val) => {
-                      setUpdateName(val.currentTarget.value);
-                    }}
-                  />
-                  <Group position="right">
-                    <Button
-                      disabled={visible ? true : false}
-                      style={{
-                        transition: "0.5s",
-                      }}
-                      radius={"xl"}
-                      onClick={() => {
-                        setKategoriId("");
-                        setUpdateName("");
-                        setVisible(true);
-                      }}
-                    >
-                      Batal
-                    </Button>
-                    <Button
-                      style={{
-                        transition: "0.5s",
-                      }}
-                      color="green"
-                      disabled={visible ? true : false}
-                      radius={"xl"}
-                      onClick={() => {
-                        onUpdate();
-                      }}
-                    >
-                      Update
-                    </Button>
-                  </Group>
-                </Stack>
-              </Paper>
-            </Stack>
-          </Grid.Col>
-          <Grid.Col span={8} h={"80vh"}>
-            <Paper p={"md"} withBorder shadow="lg" h={"100%"}>
+            <Paper p={"md"} withBorder shadow="lg" h={"70vh"}>
               <ScrollArea w={"100%"} h={"90%"}>
                 <Table
                   verticalSpacing={"xs"}
@@ -236,6 +196,9 @@ function TableView({
                       <th>
                         <Center>Kategori</Center>
                       </th>
+                      <th>
+                        <Center>Status</Center>
+                      </th>
                       <th>
                         <Center>Aksi</Center>
                       </th>
@@ -256,8 +219,142 @@ function TableView({
               </Center> */}
             </Paper>
           </Grid.Col>
+
+          <Grid.Col span={4}>
+            {isCreate ? (
+              <Paper p={"md"} withBorder>
+                <Stack>
+                  <TextInput
+                    value={create}
+                    label={<Title order={6}>Tambah Kategori</Title>}
+                    placeholder="Masukan kategori baru"
+                    onChange={(val) => {
+                      setCreate(val.currentTarget.value);
+                    }}
+                  />
+                  <Group position="right">
+                    <Button
+                      style={{
+                        transition: "0.5s",
+                      }}
+                      radius={"xl"}
+                      onClick={() => {
+                        setIsCreate(false);
+                        setCreate("");
+                      }}
+                    >
+                      Batal
+                    </Button>
+                    <Button
+                      style={{
+                        transition: "0.5s",
+                      }}
+                      disabled={create === "" ? true : false}
+                      radius={"xl"}
+                      color="teal"
+                      onClick={() => {
+                        onCreateNewKategori();
+                      }}
+                    >
+                      Simpan
+                    </Button>
+                  </Group>
+                </Stack>
+              </Paper>
+            ) : (
+              ""
+            )}
+
+            {isUpdate ? (
+              <Paper p={"md"} withBorder style={{ transition: "1s" }}>
+                <Stack>
+                  <TextInput
+                    value={updateKategori.name}
+                    label={<Title order={6}>Update Kategori</Title>}
+                    placeholder="Update kategori"
+                    onChange={(val) => {
+                      const data = _.clone(updateKategori);
+                      setUpdateKategori({
+                        kategoriId: data.kategoriId,
+                        name: val.currentTarget.value,
+                      });
+                    }}
+                  />
+                  <Group position="right">
+                    <Button
+                      style={{
+                        transition: "0.5s",
+                      }}
+                      radius={"xl"}
+                      onClick={() => {
+                        setIsUpdate(false);
+                        setUpdateKategori({
+                          kategoriId: "",
+                          name: "",
+                        });
+                      }}
+                    >
+                      Batal
+                    </Button>
+                    <Button
+                      disabled={updateKategori.name === "" ? true : false}
+                      style={{
+                        transition: "0.5s",
+                      }}
+                      color="green"
+                      radius={"xl"}
+                      onClick={() => {
+                        onUpdate();
+                      }}
+                    >
+                      Update
+                    </Button>
+                  </Group>
+                </Stack>
+              </Paper>
+            ) : (
+              ""
+            )}
+          </Grid.Col>
         </Grid>
       </Stack>
+
+      <Modal
+        opened={isChangeStatus}
+        onClose={() => setIsChangeStatus(false)}
+        withCloseButton={false}
+        centered
+      >
+        <Stack align="center">
+          <Title order={5}>
+            Anda ingin{" "}
+            {updateStatus.isActive ? (
+              <Text span inherit>
+                mengaktifkan
+              </Text>
+            ) : (
+              <Text span inherit>
+                menonaktifkan
+              </Text>
+            )}{" "}
+            Bank ini ?
+          </Title>
+          <Group>
+            <Button radius={"xl"} onClick={() => setIsChangeStatus(false)}>
+              Batal
+            </Button>
+            <Button
+              color="green"
+              radius={"xl"}
+              onClick={() => {
+                onChangeStatus();
+              }}
+            >
+              Iya
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
     </>
   );
 }

src/app_modules/admin/donasi/sub_menu/table_publish.tsx

@@ -22,7 +22,7 @@ import ComponentAdminDonasi_TombolKembali from "../component/tombol_kembali";
 import { MODEL_DONASI } from "@/app_modules/donasi/model/interface";
 import { useState } from "react";
 import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import adminDonasi_getListPublish from "../fun/get/get_list_publish";
 
 export default function AdminDonasi_TablePublish({

src/app_modules/admin/donasi/sub_menu/table_reject.tsx

@@ -31,7 +31,7 @@ import AdminDonasi_DetailReview from "../detail/detail_review";
 import { MODEL_DONASI } from "@/app_modules/donasi/model/interface";
 import { useState } from "react";
 import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import adminDonasi_getListReject from "../fun/get/get_list_reject";
 
 export default function AdminDonasi_TableReject({

src/app_modules/admin/donasi/sub_menu/table_review.tsx

@@ -25,7 +25,7 @@ import AdminDonasi_DetailReview from "../detail/detail_review";
 import { MODEL_DONASI } from "@/app_modules/donasi/model/interface";
 import { useState } from "react";
 import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import _ from "lodash";
 import adminDonasi_getListReview from "../fun/get/get_list_review";
 

src/app_modules/admin/event/child/riwayat.tsx

@@ -18,7 +18,7 @@ import {
   Text,
   Title,
 } from "@mantine/core";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import {
   MODEL_EVENT,
   MODEL_EVENT_PESERTA,

src/app_modules/admin/event/child/tipe_acara.tsx

@@ -16,7 +16,7 @@ import {
   Title,
 } from "@mantine/core";
 import ComponentAdminDonasi_TombolKembali from "../../donasi/component/tombol_kembali";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import { MODEL_DEFAULT_MASTER_OLD } from "@/app_modules/model_global/interface";
 import { useState } from "react";
 import { AdminEvent_funCreateTipeAcara } from "../fun/create/fun_create_tipe_acara";

src/app_modules/admin/event/main/index.tsx

@@ -16,7 +16,7 @@ import {
 } from "@mantine/core";
 import { IconChevronsRight } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 
 export default function AdminEvent_Main({
   countPublish,

src/app_modules/admin/event/table_status/table_publish.tsx

@@ -36,7 +36,7 @@ import {
   MODEL_EVENT,
   MODEL_EVENT_PESERTA,
 } from "@/app_modules/event/model/interface";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import moment from "moment";
 import _ from "lodash";
 import { AdminEvent_funEditStatusPublishById } from "../fun/edit/fun_edit_status_publish_by_id";

src/app_modules/admin/event/table_status/table_reject.tsx

@@ -33,7 +33,7 @@ import { useState } from "react";
 import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
 import ComponentAdminDonasi_TombolKembali from "../../donasi/component/tombol_kembali";
 import { MODEL_EVENT } from "@/app_modules/event/model/interface";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import moment from "moment";
 import _ from "lodash";
 import { AdminEvent_funEditStatusPublishById } from "../fun/edit/fun_edit_status_publish_by_id";

src/app_modules/admin/event/table_status/table_review.tsx

@@ -31,7 +31,7 @@ import { useState } from "react";
 import TampilanRupiahDonasi from "@/app_modules/donasi/component/tampilan_rupiah";
 import ComponentAdminDonasi_TombolKembali from "../../donasi/component/tombol_kembali";
 import { MODEL_EVENT } from "@/app_modules/event/model/interface";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import moment from "moment";
 import _ from "lodash";
 import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
@@ -134,9 +134,7 @@ function TableStatus({ listReview }: { listReview: MODEL_EVENT[] }) {
             <Button
               radius={"xl"}
               onClick={() => {
-                onReject(eventId, catatan, setData, close);
-
-                // console.log("hehe")
+                onReject(eventId, catatan, setData, close)
               }}
             >
               Simpan

src/app_modules/admin/forum/child/publish/index.tsx

@@ -2,7 +2,7 @@
 
 import { RouterAdminForum } from "@/app/lib/router_admin/router_admin_forum";
 import { RouterForum } from "@/app/lib/router_hipmi/router_forum";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { MODEL_FORUM_POSTING } from "@/app_modules/forum/model/interface";
 import {
   Badge,

src/app_modules/admin/forum/children/semua_komentar/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterAdminForum } from "@/app/lib/router_admin/router_admin_forum";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import ComponentAdminDonasi_TombolKembali from "@/app_modules/admin/donasi/component/tombol_kembali";
 import {
   MODEL_FORUM_KOMENTAR,

src/app_modules/admin/forum/hasil_report/komentar/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterAdminForum } from "@/app/lib/router_admin/router_admin_forum";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import ComponentAdminDonasi_TombolKembali from "@/app_modules/admin/donasi/component/tombol_kembali";
 import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/component_global/notif_global/notifikasi_berhasil";
 import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/component_global/notif_global/notifikasi_gagal";

src/app_modules/admin/forum/hasil_report/posting/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterAdminForum } from "@/app/lib/router_admin/router_admin_forum";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import ComponentAdminDonasi_TombolKembali from "@/app_modules/admin/donasi/component/tombol_kembali";
 import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/component_global/notif_global/notifikasi_berhasil";
 import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/component_global/notif_global/notifikasi_gagal";

src/app_modules/admin/forum/main/index.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { Group, Paper, SimpleGrid, Stack, Text, Title } from "@mantine/core";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
-import ComponentAdminGlobal_LoadingPage from "../../component/loading_admin_page";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
+import ComponentAdminGlobal_LoadingPage from "../../component_global/loading_admin_page";
 
 export default function AdminForum_Main({
   countPublish,

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

@@ -38,7 +38,7 @@ import moment from "moment";
 import _ from "lodash";
 import TableTotalInvestasi from "./table_total_investasi";
 import TablePublikasiProgresInvestasi from "./table_publikasi_progres";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 
 export default function Admin_Investasi({
   listInvestasi,

src/app_modules/admin/job/child/arsip/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { AdminEvent_getListPesertaById } from "@/app_modules/admin/event/fun/get/get_list_peserta_by_id";
 import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/component_global/notif_global/notifikasi_peringatan";
 import {

src/app_modules/admin/job/child/table_publish/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterJob } from "@/app/lib/router_hipmi/router_job";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { MODEL_JOB } from "@/app_modules/job/model/interface";
 import {
   Avatar,

src/app_modules/admin/job/child/table_reject/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterJob } from "@/app/lib/router_hipmi/router_job";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { MODEL_JOB } from "@/app_modules/job/model/interface";
 import {
   Avatar,

src/app_modules/admin/job/child/table_review/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterJob } from "@/app/lib/router_hipmi/router_job";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { MODEL_JOB } from "@/app_modules/job/model/interface";
 import {
   Avatar,

src/app_modules/admin/job/main/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { Group, Paper, SimpleGrid, Stack, Text, Title } from "@mantine/core";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 import { useRouter } from "next/navigation";
 
 export default function AdminJob_Main({

src/app_modules/admin/layout.tsx

@@ -3,16 +3,12 @@
 import {
   ActionIcon,
   AppShell,
-  Avatar,
   Box,
   Burger,
-  Center,
   Divider,
   Drawer,
-  Footer,
   Group,
   Header,
-  Loader,
   MediaQuery,
   NavLink,
   Navbar,
@@ -20,41 +16,25 @@ import {
   Stack,
   Text,
   Title,
-  useMantineTheme,
+  useMantineTheme
 } from "@mantine/core";
-import React, { useState } from "react";
-import ComponentGlobal_HeaderTamplate from "../component_global/header_tamplate";
-import { useDisclosure } from "@mantine/hooks";
 import {
-  IconCheck,
+  IconBell,
   IconCircleDot,
   IconCircleDotFilled,
-  IconDashboard,
-  IconHome,
-  IconLetterH,
-  IconLogout,
+  IconDashboard
 } from "@tabler/icons-react";
-import {
-  RouterAdminAward,
-  RouterAdminDashboard,
-  RouterAdminDonasi_OLD,
-  RouterAdminInvestasi_OLD,
-} from "@/app/lib/router_hipmi/router_admin";
-import { useRouter } from "next/navigation";
-import { RouterHome } from "@/app/lib/router_hipmi/router_home";
-import { Logout } from "@/app_modules/auth";
 import { useAtom } from "jotai";
-import { gs_admin_hotMenu, gs_admin_subMenu } from "./global_state";
-import Admin_Logout from "./component/logout";
-import { RouterAdminEvent } from "@/app/lib/router_admin/router_admin_event";
 import _ from "lodash";
-import { listAdminPage } from "./list_page";
-import { RouterAdminVote } from "@/app/lib/router_admin/router_admin_vote";
-import { RouterAdminJob } from "@/app/lib/router_admin/router_admin_job";
-import { gs_kodeId } from "../auth/state/state";
+import { useRouter } from "next/navigation";
+import React, { useState } from "react";
 import { auth_Logout } from "../auth/fun/fun_logout";
+import { gs_kodeId } from "../auth/state/state";
 import { ComponentGlobal_NotifikasiBerhasil } from "../component_global/notif_global/notifikasi_berhasil";
 import { ComponentGlobal_NotifikasiPeringatan } from "../component_global/notif_global/notifikasi_peringatan";
+import Admin_Logout from "./component_global/logout";
+import { gs_admin_hotMenu, gs_admin_subMenu } from "./global_state";
+import { listAdminPage } from "./list_page";
 
 export default function AdminLayout({
   userRole,
@@ -224,40 +204,23 @@ export default function AdminLayout({
         navbar={
           <MediaQuery smallerThan={"md"} styles={{ display: "none" }}>
             <Navbar
-              h={"100vh"}
-              width={{ lg: 200, md: 200, sm: 200, base: 200 }}
+              h={"95%"}
+              width={{ lg: 250, md: 200, sm: 200, base: 250 }}
               hiddenBreakpoint="md"
               hidden={!opened}
               p="xs"
               bg={"gray.2"}
             >
-              {/* <ScrollArea h={"100vh"} scrollbarSize={2}>
-                <Navbar.Section>
-                  <Stack>
-                    {userRole === "3" ? navbarItems : notAdminDev}
-
-                  </Stack>
-                </Navbar.Section>
-              </ScrollArea> */}
-              <Navbar.Section>
-                {/* <Stack align="center" bg={"blue"} h={"100%"}>
-                  <Title order={5} ff={"sans-serif"}>
-                    Dashboard Admin
-                  </Title>
-                  <Divider />
-                </Stack> */}
+              {/* <Navbar.Section>
                 <Center h={50}>
                   <Title order={4} ff={"sans-serif"}>
                     Dashboard Admin
                   </Title>
                 </Center>
                 <Divider />
-              </Navbar.Section>
+              </Navbar.Section> */}
               <Navbar.Section grow component={ScrollArea}>
-                <Stack>
-                  {userRole === "3" ? navbarItems : notAdminDev}
-                  {/* <NavLink icon={<IconCheck />} label="Create Admin" /> */}
-                </Stack>
+                <Stack>{userRole === "3" ? navbarItems : notAdminDev}</Stack>
               </Navbar.Section>
               <Navbar.Section>
                 <Stack>
@@ -273,40 +236,46 @@ export default function AdminLayout({
             </Navbar>
           </MediaQuery>
         }
-        // header={
-        //   <Header height={50} bg={"gray.2"}>
-        //     {/* Mobile View */}
-        //     <MediaQuery largerThan="md" styles={{ display: "none" }}>
-        //       <Group h={50} align="center" px={"md"} position="apart">
-        //         <Burger
-        //           opened={opened}
-        //           onClick={() => setOpened((o) => !o)}
-        //           size="sm"
-        //           color={theme.colors.gray[6]}
-        //           mr="xl"
-        //         />
-        //         <Title order={6}>Dashboard Admin</Title>
-        //         <Admin_Logout />
-        //       </Group>
-        //     </MediaQuery>
+        header={
+          <Header height={"5vh"} bg={"gray.2"}>
+            {/* Web View */}
+            <MediaQuery smallerThan={"md"} styles={{ display: "none" }}>
+              <Group position="apart" align="center" h={"100%"} px={"md"}>
+                <Text fw={"lighter"}>Dashboard Admin</Text>
+                <Title order={4}> HIPMI</Title>
+                {/* <Group>
+                  {listAdminPage.map((e) => (
+                    <Text key={e.id}  onClick={() => router.push(e.route)}>
+                      {e.name}
+                    </Text>
+                  ))}
+                </Group> */}
+                {/* <Admin_Logout /> */}
+                <ActionIcon radius={"xl"}>
+                  <IconBell />
+                </ActionIcon>
+              </Group>
+            </MediaQuery>
 
-        //     {/* Web View */}
-        //     <MediaQuery smallerThan={"md"} styles={{ display: "none" }}>
-        //       <Group position="apart" align="center" h={50} px={"md"}>
-        //         <Text fw={"lighter"}>Dashboard Admin</Text>
-        //         <Title order={4}> HIPMI</Title>
-        //         {/* <Group>
-        //           {listAdminPage.map((e) => (
-        //             <Text key={e.id}  onClick={() => router.push(e.route)}>
-        //               {e.name}
-        //             </Text>
-        //           ))}
-        //         </Group> */}
-        //         <Admin_Logout />
-        //       </Group>
-        //     </MediaQuery>
-        //   </Header>
-        // }
+            {/* Mobile View */}
+            <MediaQuery largerThan="md" styles={{ display: "none" }}>
+              <Group h={50} align="center" px={"md"} position="apart">
+                <Burger
+                  opened={opened}
+                  onClick={() => setOpened((o) => !o)}
+                  size="sm"
+                  color={theme.colors.gray[6]}
+                  mr="xl"
+                />
+                <Title order={6}>Dashboard Admin</Title>
+                {/* <Admin_Logout /> */}
+                <ActionIcon>
+                  <IconBell />
+                </ActionIcon>
+              </Group>
+            </MediaQuery>
+          </Header>
+        }
       >
         {/* {JSON.stringify(active)} */}
         {children}

src/app_modules/admin/main_dashboard/fun/count/fun_count_user.ts

@@ -1,8 +1,13 @@
-"use server"
+"use server";
 
-import prisma from "@/app/lib/prisma"
+import prisma from "@/app/lib/prisma";
 
 export async function AdminMainDashboard_CountUser() {
-    const data = await prisma.user.count()
-    return data
-}
+  const data = await prisma.user.count({
+    where: {
+      active: true,
+      masterUserRoleId: "1",
+    },
+  });
+  return data;
+}

src/app_modules/admin/vote/child/riwayat/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { AdminEvent_getListPesertaById } from "@/app_modules/admin/event/fun/get/get_list_peserta_by_id";
 import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/component_global/notif_global/notifikasi_peringatan";
 import { MODEL_VOTING } from "@/app_modules/vote/model/interface";

src/app_modules/admin/vote/child/table_publish/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { AdminEvent_getListPesertaById } from "@/app_modules/admin/event/fun/get/get_list_peserta_by_id";
 import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/component_global/notif_global/notifikasi_peringatan";
 import {

src/app_modules/admin/vote/child/table_reject/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { AdminEvent_getListPesertaById } from "@/app_modules/admin/event/fun/get/get_list_peserta_by_id";
 import { MODEL_VOTING } from "@/app_modules/vote/model/interface";
 import {

src/app_modules/admin/vote/child/table_review/index.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
-import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "@/app_modules/admin/component_global/header_tamplate";
 import { AdminEvent_getListPesertaById } from "@/app_modules/admin/event/fun/get/get_list_peserta_by_id";
 import { MODEL_VOTING } from "@/app_modules/vote/model/interface";
 import {

src/app_modules/admin/vote/main/index.tsx

@@ -2,7 +2,7 @@
 
 import { Stack, SimpleGrid, Paper, Group, Title, Text } from "@mantine/core";
 import { useRouter } from "next/navigation";
-import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate";
+import ComponentAdminGlobal_HeaderTamplate from "../../component_global/header_tamplate";
 
 export default function AdminVote_Main({
   countPublish,

src/app_modules/auth/validasi/layout.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { ActionIcon, AppShell, Box, Group, Header, Stack } from "@mantine/core";
+import { ActionIcon, Box, Stack } from "@mantine/core";
 import { IconChevronLeft } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
 import React from "react";
@@ -32,29 +32,3 @@ export default function LayoutValidasi({
   );
 }
 
-// export default function LayoutValidasi({
-//   children,
-// }: {
-//   children: React.ReactNode;
-// }) {
-//     const router = useRouter()
-
-//   return (
-//     <>
-//       <AppShell
-//       bg={"red"}
-//         header={
-//           <Header height={50} sx={{borderStyle: "none"}} px={"md"} bg={"yellow"}>
-//            <Group h={50} align="center">
-//            <ActionIcon variant="transparent" onClick={() => router.back()} >
-//               <IconChevronLeft />
-//             </ActionIcon>
-//            </Group>
-//           </Header>
-//         }
-//       >
-//         {children}
-//       </AppShell>
-//     </>
-//   );
-// }

src/app_modules/colab/create/layout.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
+import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
 import React from "react";
 import ComponentColab_HeaderTamplate from "../component/header_tamplate";
 
@@ -11,11 +11,11 @@ export default function LayoutColab_Create({
 }) {
   return (
     <>
-      <AppShell
+      <AppComponentGlobal_LayoutTamplate
         header={<ComponentColab_HeaderTamplate title="Tambah Proyek" />}
       >
         {children}
-      </AppShell>
+      </AppComponentGlobal_LayoutTamplate>
     </>
   );
 }

src/app_modules/colab/detail/grup/layout.tsx

@@ -1,35 +1,23 @@
 "use client";
 
+import { RouterColab } from "@/app/lib/router_hipmi/router_colab";
 import {
   ActionIcon,
-  AppShell,
   Box,
   Center,
-  Footer,
   Grid,
   Group,
   Header,
   Stack,
-  Text,
-  TextInput,
-  Textarea,
-  Title,
+  Title
 } from "@mantine/core";
-import React, { useState } from "react";
-import ComponentColab_HeaderTamplate from "../../component/header_tamplate";
 import {
   IconChevronLeft,
-  IconInfoSquareRounded,
-  IconPlane,
-  IconSend,
+  IconInfoSquareRounded
 } from "@tabler/icons-react";
-import { useAtom } from "jotai";
-import { gs_colab_pesan } from "../../global_state";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
-import { MODEL_COLLABORATION_ROOM_CHAT } from "../../model/interface";
-import { RouterColab } from "@/app/lib/router_hipmi/router_colab";
-import { useViewportSize } from "@mantine/hooks";
 import { useRouter } from "next/navigation";
+import React, { useState } from "react";
+import { MODEL_COLLABORATION_ROOM_CHAT } from "../../model/interface";
 
 export default function LayoutColab_DetailGrupDiskusi({
   children,

src/app_modules/colab/detail/main_detail/layout.tsx

@@ -1,10 +1,10 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
+import { RouterColab } from "@/app/lib/router_hipmi/router_colab";
+import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
+import { IconEdit } from "@tabler/icons-react";
 import React from "react";
 import ComponentColab_HeaderTamplate from "../../component/header_tamplate";
-import { IconEdit } from "@tabler/icons-react";
-import { RouterColab } from "@/app/lib/router_hipmi/router_colab";
 
 export default function LayoutColab_MainDetail({
   children,
@@ -17,7 +17,7 @@ export default function LayoutColab_MainDetail({
 }) {
   return (
     <>
-      <AppShell
+      <AppComponentGlobal_LayoutTamplate
         header={
           <ComponentColab_HeaderTamplate
             title="Detail"
@@ -27,7 +27,7 @@ export default function LayoutColab_MainDetail({
         }
       >
         {children}
-      </AppShell>
+      </AppComponentGlobal_LayoutTamplate>
     </>
   );
 }

src/app_modules/colab/detail/proyek/partisipasi/layout.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import ComponentColab_HeaderTamplate from "@/app_modules/colab/component/header_tamplate";
-import { AppShell } from "@mantine/core";
+import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
 
 export default function LayoutColab_DetailPartisipasiProyek({
   children,
@@ -10,7 +10,11 @@ export default function LayoutColab_DetailPartisipasiProyek({
 }) {
   return (
     <>
-      <AppShell header={<ComponentColab_HeaderTamplate title="Detail Partisipan"/>}>{children}</AppShell>
+      <AppComponentGlobal_LayoutTamplate
+        header={<ComponentColab_HeaderTamplate title="Detail Partisipan" />}
+      >
+        {children}
+      </AppComponentGlobal_LayoutTamplate>
     </>
   );
 }

src/app_modules/colab/detail/status/publish/layout.tsx

@@ -2,7 +2,6 @@
 
 import ComponentColab_HeaderTamplate from "@/app_modules/colab/component/header_tamplate";
 import { AppShell } from "@mantine/core";
-import { IconEdit } from "@tabler/icons-react";
 import React from "react";
 
 export default function LayoutColab_DetailStatusPublish({
@@ -12,13 +11,7 @@ export default function LayoutColab_DetailStatusPublish({
 }) {
   return (
     <>
-      <AppShell
-        header={
-          <ComponentColab_HeaderTamplate
-            title="Proyek Saya"
-          />
-        }
-      >
+      <AppShell header={<ComponentColab_HeaderTamplate title="Proyek Saya" />}>
         {children}
       </AppShell>
     </>

src/app_modules/colab/edit/layout.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
+import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
 import React from "react";
 import ComponentColab_HeaderTamplate from "../component/header_tamplate";
 
@@ -11,9 +11,9 @@ export default function LayoutColab_Edit({
 }) {
   return (
     <>
-      <AppShell header={<ComponentColab_HeaderTamplate title="Edit Proyek" />}>
+      <AppComponentGlobal_LayoutTamplate header={<ComponentColab_HeaderTamplate title="Edit Proyek" />}>
         {children}
-      </AppShell>
+      </AppComponentGlobal_LayoutTamplate>
     </>
   );
 }

src/app_modules/colab/main/layout.tsx

@@ -1,35 +1,28 @@
 "use client";
 
+import { RouterColab } from "@/app/lib/router_hipmi/router_colab";
+import { RouterHome } from "@/app/lib/router_hipmi/router_home";
+import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
 import {
   ActionIcon,
-  AppShell,
-  Box,
   Center,
   Footer,
   Grid,
   Indicator,
-  Loader,
   Stack,
-  Text,
+  Text
 } from "@mantine/core";
-import React, { useState } from "react";
-import ComponentColab_HeaderTamplate from "../component/header_tamplate";
-import router from "next/router";
 import {
   IconBell,
-  IconHistory,
   IconHome,
   IconMessages,
-  IconReservedLine,
-  IconUsersGroup,
+  IconUsersGroup
 } from "@tabler/icons-react";
-import { RouterColab } from "@/app/lib/router_hipmi/router_colab";
-import { useRouter } from "next/navigation";
 import { useAtom } from "jotai";
+import { useRouter } from "next/navigation";
+import React, { useState } from "react";
+import ComponentColab_HeaderTamplate from "../component/header_tamplate";
 import { gs_colab_hot_menu } from "../global_state";
-import { RouterHome } from "@/app/lib/router_hipmi/router_home";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
-import { useTimeout } from "@mantine/hooks";
 
 export default function LayoutColab_Main({
   children,

src/app_modules/crowd/main/layout.tsx

@@ -2,8 +2,6 @@
 
 import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
 import ComponentGlobal_HeaderTamplate from "@/app_modules/component_global/header_tamplate";
-import { ActionIcon, AppShell, Group, Header, Text } from "@mantine/core";
-import { IconArrowLeft } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
 import React from "react";
 

src/app_modules/donasi/create/create_donasi.tsx

@@ -2,9 +2,7 @@
 
 import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
 import {
-  ActionIcon,
   AspectRatio,
-  Box,
   Button,
   Center,
   FileButton,
@@ -13,27 +11,24 @@ import {
   Select,
   Stack,
   Text,
-  TextInput,
-  Textarea,
+  TextInput
 } from "@mantine/core";
 import { IconCamera } from "@tabler/icons-react";
 import { useAtom } from "jotai";
 import { useRouter } from "next/navigation";
 
-import ComponentDonasi_NotedBox from "../component/noted_box";
-import { MODEL_DONASI_ALL_MASTER } from "../model/interface";
-import { useState } from "react";
-import { useShallowEffect } from "@mantine/hooks";
-import Donasi_funCreateTemporary from "../fun/create/fun_create_donasi_temporary";
-import toast from "react-simple-toasts";
-import _ from "lodash";
-import { notifications } from "@mantine/notifications";
-import { NotifPeringatan } from "../component/notifikasi/notif_peringatan";
 import {
   ComponentGlobal_WarningMaxUpload,
   maksimalUploadFile,
 } from "@/app_modules/component_global/variabel_global";
+import _ from "lodash";
+import { useState } from "react";
+import toast from "react-simple-toasts";
+import ComponentDonasi_NotedBox from "../component/noted_box";
+import { NotifPeringatan } from "../component/notifikasi/notif_peringatan";
+import Donasi_funCreateTemporary from "../fun/create/fun_create_donasi_temporary";
 import { gs_donasi_tabs_posting } from "../global_state";
+import { MODEL_DONASI_ALL_MASTER } from "../model/interface";
 
 export default function CreateDonasi({
   masterKategori,

src/app_modules/donasi/create/create_kabar/index.tsx

@@ -23,6 +23,8 @@ import _ from "lodash";
 import { NotifPeringatan } from "../../component/notifikasi/notif_peringatan";
 import ComponentDonasi_NotedBox from "../../component/noted_box";
 import { Donasi_funCreateNotif } from "../../fun/create/fun_create_notif";
+import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/component_global/notif_global/notifikasi_berhasil";
+import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/component_global/notif_global/notifikasi_gagal";
 
 export default function Donasi_CreateKabar({ donasiId }: { donasiId: string }) {
   const router = useRouter();
@@ -137,14 +139,16 @@ async function onSave(
 
   await Donasi_funCreateKabar(body as any, gambar).then(async (res) => {
     if (res.status === 200) {
-      await Donasi_funCreateNotif(body.donasiId, res.kabarId as any).then((val) => {
-        if (val.status === 200) {
-          NotifBerhasil(res.message);
-          router.back();
+      await Donasi_funCreateNotif(body.donasiId, res.kabarId as any).then(
+        (val) => {
+          if (val.status === 200) {
+            ComponentGlobal_NotifikasiBerhasil(res.message);
+            router.back();
+          }
         }
-      });
+      );
     } else {
-      NotifGagal(res.message);
+      ComponentGlobal_NotifikasiGagal(res.message);
     }
   });
 }

src/app_modules/donasi/create/create_kabar/layout.tsx

@@ -1,9 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
+import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
 import React from "react";
 import ComponentDonasi_HeaderTamplate from "../../component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate";
 
 export default function LayoutDonasi_CreateKabar({
   children,

src/app_modules/donasi/create/layout.tsx

@@ -1,9 +1,8 @@
 "use client"
 
-import { AppShell } from "@mantine/core"
+import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate"
 import React from "react"
 import ComponentDonasi_HeaderTamplate from "../component/header_tamplate"
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/component_global/component_layout_tamplate"
 
 export default function LayoutCreateDonasi({children}: {children: React.ReactNode}){
     return<>