Merge pull request #73 from bipproduction/colab/ui

Colab/UI

package.json

@@ -35,7 +35,6 @@
     "@types/node": "20.4.5",
     "@types/react": "18.2.17",
     "@types/react-dom": "18.2.7",
-    "@types/react-virtualized": "^9.21.30",
     "@types/uuid": "^9.0.4",
     "autoprefixer": "10.4.14",
     "bufferutil": "^4.0.8",
@@ -53,7 +52,7 @@
     "mqtt": "^5.5.0",
     "next": "^13.5.4-canary.8",
     "next-dev": "^1.1.9",
-    "next-scroll-loader": "^1.0.5",
+    "next-scroll-loader": "^1.0.9",
     "postcss": "8.4.27",
     "react": "18.2.0",
     "react-countdown": "^2.3.5",
@@ -67,7 +66,6 @@
     "react-responsive-carousel": "^3.2.23",
     "react-simple-toasts": "^5.10.0",
     "react-toastify": "^9.1.3",
-    "react-virtualized": "^9.22.5",
     "socket.io-client": "^4.7.2",
     "tailwindcss": "3.3.3",
     "ts-node": "^10.9.2",

prisma/schema.prisma

@@ -865,8 +865,9 @@ model Notifikasi {
   Role       MasterUserRole? @relation(fields: [userRoleId], references: [id])
   userRoleId String
 
-  User    User   @relation("UserNotifikasi", fields: [userId], references: [id], map: "NotifikasiUser")
+  User    User?    @relation("UserNotifikasi", fields: [userId], references: [id], map: "NotifikasiUser")
-  userId  String
+  userId  String?
-  Admin   User   @relation("AdminNotifikasi", fields: [adminId], references: [id], map: "NotifikasiAdmin")
+  Admin   User?   @relation("AdminNotifikasi", fields: [adminId], references: [id], map: "NotifikasiAdmin")
-  adminId String
+  adminId String?
+
 }

src/app/dev/admin/forum/child/report-komentar/page.tsx

@@ -1,9 +0,0 @@
-import { AdminForum_TableReportKomentar } from "@/app_modules/admin/forum";
-
-export default async function Page() {
-  return (
-    <>
-      <AdminForum_TableReportKomentar />
-    </>
-  );
-}

src/app/dev/admin/forum/child/report-posting/page.tsx

@@ -1,9 +0,0 @@
-import { AdminForum_TableReportPosting } from "@/app_modules/admin/forum";
-
-export default async function Page() {
-  return (
-    <>
-      <AdminForum_TableReportPosting />
-    </>
-  );
-}

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

@@ -1,17 +1,25 @@
 import { AdminForum_LihatSemuaKomentar } from "@/app_modules/admin/forum";
+import adminForum_countKomentarByPostingId from "@/app_modules/admin/forum/fun/count/fun_count_komentar_by_id";
 import { adminForum_getListKomentarById } from "@/app_modules/admin/forum/fun/get/get_list_komentar_by_id";
 import { adminForum_getOnePostingById } from "@/app_modules/admin/forum/fun/get/get_one_posting_by_id";
 
 export default async function Page({ params }: { params: { id: string } }) {
   let postingId = params.id;
-  const listKomentar = await adminForum_getListKomentarById(postingId);
+
+  const listKomentar = await adminForum_getListKomentarById({
+    postingId: postingId,
+    page: 1,
+  });
   const dataPosting = await adminForum_getOnePostingById(postingId);
+  const countKomentar = await adminForum_countKomentarByPostingId({postingId: postingId})
+
 
   return (
     <>
       <AdminForum_LihatSemuaKomentar
         listKomentar={listKomentar as any}
         dataPosting={dataPosting as any}
+        countKomentar={countKomentar}
       />
     </>
   );

src/app/dev/admin/forum/hasil-report/komentar/[id]/page.tsx

@@ -1,13 +0,0 @@
-import { AdminForum_HasilReportKomentar } from "@/app_modules/admin/forum"
-import { adminForum_getListReportKomentarbyId } from "@/app_modules/admin/forum/fun/get/get_list_report_komentar_by_id";
-
-export default async function Page({params}: {params: {id: string}}) {
-    let komentarId = params.id
-    const listReport = await adminForum_getListReportKomentarbyId(komentarId)
-
-    return (
-      <>
-        <AdminForum_HasilReportKomentar listReport={listReport} komentarId={komentarId} />
-      </>
-    );
-}

src/app/dev/admin/forum/sub-detail/report-komentar/[id]/page.tsx

@@ -0,0 +1,24 @@
+import { AdminForum_HasilReportKomentar } from "@/app_modules/admin/forum";
+import { adminForum_getListReportKomentarbyId } from "@/app_modules/admin/forum/fun/get/get_list_report_komentar_by_id";
+import adminForum_funGetOneKomentarById from "@/app_modules/admin/forum/fun/get/get_one_komentar_by_id";
+
+export default async function Page({ params }: { params: { id: string } }) {
+  let komentarId = params.id;
+  const listReport = await adminForum_getListReportKomentarbyId({
+    komentarId: komentarId,
+    page: 1,
+  });
+  const dataKomentar = await adminForum_funGetOneKomentarById({
+    komentarId: komentarId,
+  });
+
+  return (
+    <>
+      <AdminForum_HasilReportKomentar
+        listReport={listReport}
+        komentarId={komentarId}
+        dataKomentar={dataKomentar as any}
+      />
+    </>
+  );
+}

src/app/dev/admin/forum/sub-detail/report-posting/[id]/page.tsx

@@ -1,14 +1,20 @@
 import { AdminForum_HasilReportPosting } from "@/app_modules/admin/forum";
 import { adminForum_getListReportPostingById } from "@/app_modules/admin/forum/fun/get/get_list_report_posting_by_id";
+import { adminForum_getOnePostingById } from "@/app_modules/admin/forum/fun/get/get_one_posting_by_id";
 
 export default async function Page({ params }: { params: { id: string } }) {
   let postingId = params.id;
-  const listReport = await adminForum_getListReportPostingById(postingId);
+  const listReport = await adminForum_getListReportPostingById({
+    postingId: postingId,
+    page: 1,
+  });
+
+  const dataPosting = await adminForum_getOnePostingById(postingId);
 
   return (
     <>
       <AdminForum_HasilReportPosting
-        postingId={postingId}
+        dataPosting={dataPosting as any}
         listReport={listReport}
       />
     </>

src/app/dev/admin/forum/sub-menu/posting/page.tsx

@@ -1,8 +1,8 @@
 import { AdminForum_TablePublish } from "@/app_modules/admin/forum";
-import { adminForum_getListPublish } from "@/app_modules/admin/forum/fun/get/get_list_publish";
+import { adminForum_getListPosting } from "@/app_modules/admin/forum/fun/get/get_list_publish";
 
 export default async function Page() {
-  const listPublish = await adminForum_getListPublish();
+  const listPublish = await adminForum_getListPosting({page: 1});
 
   return (
     <>

src/app/dev/admin/forum/sub-menu/report-komentar/page.tsx

@@ -0,0 +1,12 @@
+import adminForum_funGetAllReportKomentar from "@/app_modules/admin/forum/fun/get/get_all_report_komentar";
+import AdminForum_TableReportKomentar from "@/app_modules/admin/forum/sub_menu/table_report_komentar";
+
+export default async function Page() {
+  const listData = await adminForum_funGetAllReportKomentar({ page: 1 });
+
+  return (
+    <>
+      <AdminForum_TableReportKomentar listData={listData} />
+    </>
+  );
+}

src/app/dev/admin/forum/sub-menu/report-posting/page.tsx

@@ -0,0 +1,12 @@
+import { AdminForum_TableReportPosting } from "@/app_modules/admin/forum";
+import adminForum_funGetAllReportPosting from "@/app_modules/admin/forum/fun/get/get_all_report_posting";
+
+export default async function Page() {
+  const listData = await adminForum_funGetAllReportPosting({ page: 1 });
+
+  return (
+    <>
+      <AdminForum_TableReportPosting listData={listData} />
+    </>
+  );
+}

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

@@ -6,5 +6,9 @@ export default async function Page() {
   const countUser = await AdminMainDashboard_CountUser();
   const countPorto = await AdminMainDashboard_CountPOrtofolio();
 
+  // await new Promise((a, b) => {
+  //   setTimeout(a, 4000);
+  // });
+
   return <AdminMain countUser={countUser} countPorto={countPorto} />;
 }

src/app/dev/auth/validasi/[id]/layout.tsx

@@ -1,16 +0,0 @@
-import { LayoutValidasi } from "@/app_modules/auth";
-import { ActionIcon, Button } from "@mantine/core";
-import Link from "next/link";
-import React from "react";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <LayoutValidasi>{children}</LayoutValidasi>
-    </>
-  );
-}

src/app/dev/colab/detail/group/[id]/page.tsx

@@ -1,7 +1,5 @@
 import adminColab_getOneRoomChatById from "@/app_modules/admin/colab/fun/get/get_one_room_chat_by_id";
 import { Colab_GroupChatView } from "@/app_modules/colab";
-import ColabViewChat from "@/app_modules/colab/detail/chat";
-import colab_V2getListMessageByRoomId from "@/app_modules/colab/fun/chat/get_message_by_room_id";
 import colab_getMessageByRoomId from "@/app_modules/colab/fun/get/room_chat/get_message_by_room_id";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";

src/app/dev/colab/detail/grup/[id]/layout.tsx

@@ -1,24 +0,0 @@
-import prisma from "@/app/lib/prisma";
-import { LayoutColab_DetailGrupDiskusi } from "@/app_modules/colab";
-import colab_getListAnggotaByRoomId from "@/app_modules/colab/fun/get/room_chat/get_list_anggota_by_room_id";
-import React from "react";
-
-export default async function Layout({
-  children,
-  params,
-}: {
-  children: React.ReactNode;
-  params: { id: string };
-}) {
-  let roomId = params.id;
-  const dataRoom = await colab_getListAnggotaByRoomId(roomId);
-  
-
-  return (
-    <>
-      <LayoutColab_DetailGrupDiskusi dataRoom={dataRoom as any}>
-        {children}
-      </LayoutColab_DetailGrupDiskusi>
-    </>
-  );
-}

src/app/dev/colab/detail/grup/[id]/page.tsx

@@ -1,20 +0,0 @@
-import { Colab_DetailGrupDiskusi } from "@/app_modules/colab";
-import colab_getMessageByRoomId from "@/app_modules/colab/fun/get/room_chat/get_message_by_room_id";
-import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
-import _ from "lodash";
-
-export default async function Page({ params }: { params: { id: string } }) {
-  let roomId = params.id;
-  const userLoginId = await user_getOneUserId();
-  let listMsg = await colab_getMessageByRoomId({ page: 1, roomId: roomId });
-
-  return (
-    <>
-      <Colab_DetailGrupDiskusi
-        roomId={roomId}
-        listMsg={listMsg}
-        userLoginId={userLoginId}
-      />
-    </>
-  );
-}

src/app/dev/colab/detail/main_detail/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/colab/detail/proyek/saya/[id]/layout.tsx

@@ -1,6 +1,4 @@
 import { LayoutColab_DetailProyekSaya } from "@/app_modules/colab";
-import colab_getOneCollaborationById from "@/app_modules/colab/fun/get/get_one_by_id";
-import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 import React from "react";
 
 export default async function Layout({
@@ -11,11 +9,11 @@ export default async function Layout({
   params: { id: string };
 }) {
   let colabId = params.id;
-  const dataColab = await colab_getOneCollaborationById(colabId)
+
 
   return (
     <>
-      <LayoutColab_DetailProyekSaya dataColab={dataColab as any}>
+      <LayoutColab_DetailProyekSaya colabId={colabId}>
         {children}
       </LayoutColab_DetailProyekSaya>
     </>

src/app/dev/colab/detail/status/publish/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/colab/detail/status/reject/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/colab/detail/status/review/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/colab/main/beranda/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

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

@@ -3,7 +3,7 @@ import colab_getListAllProyek from "@/app_modules/colab/fun/get/get_list_all_pro
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 
 export default async function Page() {
-  const listData = await colab_getListAllProyek();
+  const listData = await colab_getListAllProyek({page: 1});
   const userLoginId = await user_getOneUserId();
 
   return (

src/app/dev/colab/main/grup/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/colab/main/grup/page.tsx

@@ -2,7 +2,7 @@ import colab_getListRoomChatByAuthorId from "@/app_modules/colab/fun/get/room_ch
 import Colab_GrupDiskus from "@/app_modules/colab/main/grup";
 
 export default async function Page() {
-  const listRoom = await colab_getListRoomChatByAuthorId();
+  const listRoom = await colab_getListRoomChatByAuthorId({page: 1});
 
   return (
     <>

src/app/dev/colab/main/proyek/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/colab/main/proyek/page.tsx

@@ -1,10 +1,10 @@
 import { Colab_Proyek } from "@/app_modules/colab";
-import colab_getListPartisipasiProyekByAuthorId from "@/app_modules/colab/fun/get/get_list_partisipasi_proyek_by_author_id";
+import colab_getListPartisipasiProyekByAuthorId from "@/app_modules/colab/fun/get/pasrtisipan/get_list_partisipasi_proyek_by_author_id";
-import colab_getListAllProyekSayaByAuthorId from "@/app_modules/colab/fun/get/get_list_proyek_saya_by_author_id";
+import colab_getListAllProyekSayaByAuthorId from "@/app_modules/colab/fun/get/pasrtisipan/get_list_proyek_saya_by_author_id";
 
 export default async function Page() {
-  const listPartisipasiProyek = (await colab_getListPartisipasiProyekByAuthorId()).data;
+  const listPartisipasiProyek  = await colab_getListPartisipasiProyekByAuthorId({page: 1})
-  const listProyekSaya = (await colab_getListAllProyekSayaByAuthorId()).data;
+  const listProyekSaya = await colab_getListAllProyekSayaByAuthorId({page: 1})
 
   return (
     <>

src/app/dev/colab/main/status/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/crowd/main/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/cerita_penggalang/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

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

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/create/create_donasi/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/create/create_kabar/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/detail/detail_donasi_saya/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/detail/detail_draft/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/detail/detail_kabar/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/detail/detail_main/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/detail/detail_notif/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/detail/detail_publish/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/detail/detail_reject/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/detail/detail_review/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/donatur/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/edit/edit_cerita/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/edit/edit_donasi/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/edit/edit_rekening/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/edit/update_kabar/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/kabar/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/list_kabar/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

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

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/notif_page/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/page_pop_up/create/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/pencairan_dana/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/penggalang_dana/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/proses_donasi/invoice/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/proses_donasi/masukan_donasi/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/donasi/proses_donasi/metode_pembayaran/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

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

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/event/create/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/event/detail/draft/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/event/detail/kontribusi/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/event/detail/main/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/event/detail/publish/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/event/detail/reject/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/event/detail/review/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/event/detail/riwayat/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/event/edit/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

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

@@ -1,8 +1,8 @@
 import { Event_Beranda } from "@/app_modules/event";
-import { Event_getListAllPublish } from "@/app_modules/event/fun/get/get_list_all_publish";
+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({page: 1});
 
   return (
     <>

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

@@ -1,10 +1,9 @@
 import { Event_Kontribusi } from "@/app_modules/event";
-import { Event_getListKontibusiByUserId } from "@/app_modules/event/fun/get/get_list_kontribusi_by_user_id";
+import { event_getListKontibusiByUserId } from "@/app_modules/event/fun/get/get_list_kontribusi_by_user_id";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 
 export default async function Page() {
-  const userLoginId = await user_getOneUserId();
+  const listKontribusi = await event_getListKontibusiByUserId({page: 1})
-  const listKontribusi = await Event_getListKontibusiByUserId(userLoginId)
 
   return (
     <>

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

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

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

@@ -1,14 +1,12 @@
 import { Event_Riwayat } from "@/app_modules/event";
-import { Event_getListRiwayatSaya } from "@/app_modules/event/fun/get/get_list_riwayat_saya";
+import { event_getListRiwayatSaya } from "@/app_modules/event/fun/get/get_list_riwayat_saya";
-import { Event_getListSemuaRiwayat } from "@/app_modules/event/fun/get/get_list_semua_riwayat";
+import { event_getListSemuaRiwayat } from "@/app_modules/event/fun/get/riwayat/get_list_semua_riwayat";
-import { Event_getOneById } from "@/app_modules/event/fun/get/get_one_by_id";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 
 export default async function Page({ params }: { params: { id: string } }) {
   let eventId = params.id;
-  const authorId = await user_getOneUserId();
+  const dataSemuaRiwayat = await event_getListSemuaRiwayat({ page: 1 });
-  const dataSemuaRiwayat = await Event_getListSemuaRiwayat();
+  const dataRiwayatSaya = await event_getListRiwayatSaya({ page: 1 });
-  const dataRiwayatSaya = await Event_getListRiwayatSaya(authorId);
 
   return (
     <Event_Riwayat

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

@@ -1,13 +1,16 @@
 import { Event_StatusPage } from "@/app_modules/event";
 import { Event_getListByStatusId } from "@/app_modules/event/fun/get/get_list_event_by_status_id";
+import { event_getAllDraft } from "@/app_modules/event/fun/get/status/get_all_draft";
+import { event_getAllReject } from "@/app_modules/event/fun/get/status/get_all_reject";
+import { event_getAllReview } from "@/app_modules/event/fun/get/status/get_all_review";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 
 export default async function Page() {
   const authorId = await user_getOneUserId();
   const listPublish = await Event_getListByStatusId("1", authorId);
-  const listReview = await Event_getListByStatusId("2", authorId);
+  const listReview = await event_getAllReview({page: 1});
-  const listDraft = await Event_getListByStatusId("3", authorId);
+  const listDraft = await event_getAllDraft({ page: 1 });
-  const listReject = await Event_getListByStatusId("4", authorId);
+  const listReject = await event_getAllReject({page: 1});
 
   return (
     <Event_StatusPage

src/app/dev/event/splash/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/event/splash/page.tsx

@@ -2,7 +2,7 @@ import { Event_SplashScreen } from "@/app_modules/event";
 
 export default async function Page() {
   // await new Promise((a, b) => {
-  //   setTimeout(a, 1000);
+  //   setTimeout(a, 3000);
   // });
   return <Event_SplashScreen />;
 }

src/app/dev/forum/create/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/forum/detail/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/forum/detail/[id]/page.tsx

@@ -1,26 +0,0 @@
-import Forum_Detail from "@/app_modules/forum/detail";
-import { forum_getKomentarById } from "@/app_modules/forum/fun/get/get_komentar_by_id";
-import { forum_getOnePostingById } from "@/app_modules/forum/fun/get/get_one_posting_by_id";
-import { forum_countOneTotalKomentarById } from "@/app_modules/forum/fun/count/count_one_total_komentar_by_id";
-import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
-
-export default async function Page({ params }: { params: { id: string } }) {
-  let postingId = params.id;
-
-  const userLoginId = await user_getOneUserId()
-  const dataPosting = await forum_getOnePostingById(postingId);
-  const listKomentar = await forum_getKomentarById(postingId);
-  const totalKomentar = await forum_countOneTotalKomentarById(postingId)
-
-  
-  return (
-    <>
-      <Forum_Detail
-        dataPosting={dataPosting as any}
-        listKomentar={listKomentar as any}
-        totalKomentar={totalKomentar}
-        userLoginId={userLoginId}
-      />
-    </>
-  );
-}

src/app/dev/forum/detail/main-detail/[id]/page.tsx

@@ -0,0 +1,34 @@
+import Forum_MainDetail from "@/app_modules/forum/detail/main_detail";
+import { forum_funGetAllKomentarById } from "@/app_modules/forum/fun/get/get_all_komentar_by_id";
+import { forum_getOnePostingById } from "@/app_modules/forum/fun/get/get_one_posting_by_id";
+import { forum_countOneTotalKomentarById } from "@/app_modules/forum/fun/count/count_one_total_komentar_by_id";
+import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
+import { RouterForum } from "@/app/lib/router_hipmi/router_forum";
+import { redirect } from "next/navigation";
+import { forum_countTotalKomenById } from "@/app_modules/forum/fun/count/count_total_komentar_by_id";
+
+export default async function Page({ params }: { params: { id: string } }) {
+  let postingId = params.id;
+
+  const userLoginId = await user_getOneUserId();
+  const dataPosting = await forum_getOnePostingById(postingId);
+  const listKomentar = await forum_funGetAllKomentarById({
+    postingId: postingId,
+    page: 1,
+  });
+
+  dataPosting?.isActive === false && redirect(RouterForum.beranda);
+
+  const countKomentar = await forum_countTotalKomenById(postingId);
+
+  return (
+    <>
+      <Forum_MainDetail
+        dataPosting={dataPosting as any}
+        listKomentar={listKomentar as any}
+        userLoginId={userLoginId}
+        countKomentar={countKomentar}
+      />
+    </>
+  );
+}

src/app/dev/forum/detail/report-komentar/[id]/page.tsx

@@ -0,0 +1,13 @@
+import { Forum_DetailReportKomentar } from "@/app_modules/forum";
+import forum_funGetOneReportKomentarById from "@/app_modules/forum/fun/get/get_one_report_komentar_by_id";
+
+export default async function Page({ params }: { params: { id: string } }) {
+  const komentarId = params.id;
+  const dataKomentar = await forum_funGetOneReportKomentarById({ komentarId: komentarId });
+
+  return (
+    <>
+      <Forum_DetailReportKomentar dataKomentar={dataKomentar as any} />
+    </>
+  );
+}

src/app/dev/forum/detail/report-posting/[id]/page.tsx

@@ -0,0 +1,12 @@
+import { Forum_DetailReportPosting } from "@/app_modules/forum";
+import forum_funGetOneReportedPostingById from "@/app_modules/forum/fun/get/get_one_posting_reported_by_id";
+
+export default async function Page({params}: {params: {id: string}}) {
+  const postingId = params.id
+  const dataPosting = await forum_funGetOneReportedPostingById({postingId: postingId})
+  return (
+    <>
+      <Forum_DetailReportPosting dataPosting={dataPosting} />
+    </>
+  );
+}

src/app/dev/forum/edit/komentar/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

src/app/dev/forum/edit/posting/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/forum/forumku/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/forum/forumku/[id]/page.tsx

@@ -1,5 +1,5 @@
 import { Forum_Forumku } from "@/app_modules/forum";
-import { forum_getListPostingByAuhtorId } from "@/app_modules/forum/fun/get/get_list_posting_by_author_id";
+import { forum_getAllPostingByAuhtorId } from "@/app_modules/forum/fun/get/get_list_posting_by_author_id";
 import { forum_countOneTotalKomentarById } from "@/app_modules/forum/fun/count/count_one_total_komentar_by_id";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
@@ -25,7 +25,7 @@ export default async function Page({ params }: { params: { id: string } }) {
   //   setTimeout(a, 1000);
   // });
 
-  const dataPosting = await forum_getListPostingByAuhtorId(authorId);
+  const dataPosting = await forum_getAllPostingByAuhtorId({authorId: authorId, page: 1});
   const totalPosting = await forum_countPostingByAuthorId(authorId);
 
   return (

src/app/dev/forum/komentar/[id]/loading.tsx

@@ -1,4 +1,4 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
 
 export default async function Page() {
   return (

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

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage/>
-    </>
-  );
-}

src/app/dev/forum/main/page.tsx

@@ -1,17 +1,16 @@
-
 import { Forum_Beranda } from "@/app_modules/forum";
-import { forum_getListAllPosting } from "@/app_modules/forum/fun/get/get_list_all_posting";
+import { forum_new_getAllPosting } from "@/app_modules/forum/fun/get/new_get_all_posting";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 
 export default async function Page() {
-  const listForum = await forum_getListAllPosting();
+  const listForum = await forum_new_getAllPosting({ page: 1 });
   const userLoginId = await user_getOneUserId();
+
+  // console.log(JSON.stringify(listForum, null, 2));
+
   return (
     <>
-      <Forum_Beranda
+      <Forum_Beranda listForum={listForum as any} userLoginId={userLoginId} />
-        listForum={listForum as any}
-        userLoginId={userLoginId}
-      />
     </>
   );
 }

src/app/dev/forum/report/komentar-lainnya/[id]/loading.tsx

@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage />
-    </>
-  );
-}

src/app/dev/forum/report/komentar-lainnya/[id]/page.tsx

@@ -1,11 +1,16 @@
 import { Forum_ReportKomentarLainnya } from "@/app_modules/forum";
+import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 
 export default async function Page({ params }: { params: { id: string } }) {
   let komentarId = params.id;
+  const userLoginId = await user_getOneUserId();
 
   return (
     <>
-      <Forum_ReportKomentarLainnya komentarId={komentarId} />
+      <Forum_ReportKomentarLainnya
+        komentarId={komentarId}
+        userLoginId={userLoginId}
+      />
     </>
   );
 }