From 5fcb09b88906e74c2f2be76f5fd325daa48f5ae5 Mon Sep 17 00:00:00 2001
From: Bagasbanuna02 <bagasbanuna02@gmail.com>
Date: Mon, 18 Nov 2024 15:18:35 +0800
Subject: [PATCH 1/2] Fix: Navbar admin Deskripsi: - Fix bug navbar yang
 terpotong bagian atasnya

---
 .../investasi/halaman_aksi/[id]/layout.tsx    |  10 -
 .../investasi/halaman_aksi/[id]/page.tsx      |  10 -
 .../investasi/status_transfer/layout.tsx      |  16 -
 .../admin/investasi/status_transfer/page.tsx  |   8 -
 src/app/dev/admin/layout.tsx                  |   2 +-
 .../dialog_page/transaksi_saham/layout.tsx    |   8 -
 .../dialog_page/transaksi_saham/loading.tsx   |   9 -
 .../dialog_page/transaksi_saham/page.tsx      |   7 -
 .../investasi/edit_berita/[id]/loading.tsx    |   9 -
 .../investasi/metode_transfer/[id]/layout.tsx |  14 -
 .../metode_transfer/[id]/loading.tsx          |   9 -
 .../investasi/metode_transfer/[id]/page.tsx   |  22 --
 .../proses_investasi/[id]/layout.tsx          |   8 -
 .../proses_investasi/[id]/loading.tsx         |   9 -
 .../investasi/proses_investasi/[id]/page.tsx  |  11 -
 .../dev/investasi/transfer/[id]/layout.tsx    |  14 -
 .../dev/investasi/transfer/[id]/loading.tsx   |   9 -
 src/app/dev/investasi/transfer/[id]/page.tsx  |  17 -
 src/app/dev/investasi/upload/layout.tsx       |   8 -
 src/app/dev/investasi/upload/loading.tsx      |   9 -
 src/app/dev/investasi/upload/page.tsx         |   7 -
 src/app/dev/investasi/upload_bukti/layout.tsx |   8 -
 .../dev/investasi/upload_bukti/loading.tsx    |   9 -
 src/app/dev/investasi/upload_bukti/page.tsx   |   5 -
 src/app/dev/layout.tsx                        |   7 +-
 src/app/layout.tsx                            |   2 +-
 src/app_modules/_global/header_tamplate.tsx   |  64 ----
 .../_global/ui/ui_header_tamplate.tsx         |  14 +-
 .../_global/ui/ui_layout_tamplate.tsx         |  31 +-
 src/app_modules/_global/ui/ui_splash.tsx      |   6 +-
 .../admin/investasi/bukti_transfer/layout.tsx |  19 --
 .../admin/investasi/bukti_transfer/view.tsx   |  63 ----
 .../admin/investasi/detail/detail_review.tsx  |  20 +-
 .../admin/investasi/halaman_aksi/layout.tsx   |  20 --
 .../admin/investasi/halaman_aksi/view.tsx     |  93 ------
 src/app_modules/admin/investasi/index.tsx     |  30 +-
 .../admin/investasi/konfirmasi/layout.tsx     |  21 --
 .../investasi/status_transfer/layout.tsx      |  19 --
 .../admin/investasi/status_transfer/view.tsx  |  58 ----
 src/app_modules/admin/layout.tsx              | 301 ++++++++----------
 .../check_cookies/layout_cek_cookies.tsx      |   6 +-
 .../check_cookies/ui_check_cookies.tsx        |   9 +-
 .../colab/component/header_tamplate.tsx       |  84 -----
 .../colab/detail/main_detail/layout.tsx       |   8 +-
 .../detail/proyek/partisipasi/layout.tsx      |   4 +-
 .../colab/detail/proyek/saya/layout.tsx       |  11 +-
 src/app_modules/colab/edit/layout.tsx         |   6 +-
 .../donasi/component/header_tamplate.tsx      |  78 -----
 .../donasi/create/create_kabar/layout.tsx     |   6 +-
 .../detail/detail_donasi_saya/layout.tsx      |   6 +-
 .../donasi/detail/detail_draft/layout.tsx     |  92 +-----
 .../detail_main/cerita_penggalang/layout.tsx  |   2 -
 .../edit/edit_cerita_penggalang/layout.tsx    |   7 +-
 .../donasi/edit/edit_rekening/layout.tsx      |   7 +-
 src/app_modules/donasi/main/layout.tsx        |  79 -----
 .../donasi/proses_donasi/invoice/layout.tsx   |  15 +-
 .../proses_donasi/proses_transaksi/layout.tsx |  18 +-
 .../event/component/header_tamplate.tsx       |  77 -----
 src/app_modules/event/create/layout.tsx       |   7 +-
 .../event/detail/publish/layout.tsx           |   7 +-
 .../event/detail/review/layout.tsx            |   7 +-
 src/app_modules/event/edit/layout.tsx         |   7 +-
 .../component/header/header_rata_kiri.tsx     |  30 --
 .../component/header/header_tamplate.tsx      |  82 -----
 src/app_modules/forum/create/layout.tsx       |   7 +-
 src/app_modules/forum/detail/layout.tsx       |  35 +-
 .../forum/edit/komentar/layout.tsx            |  13 +-
 src/app_modules/forum/edit/posting/layout.tsx |   7 +-
 .../forum/report/komentar/layout.tsx          |   6 +-
 src/app_modules/home/view_home.tsx            |   4 +
 src/app_modules/investasi/detail/layout.tsx   |  29 +-
 .../investasi/detail_berita/layout.tsx        |   3 -
 .../investasi/detail_dokumen/layout.tsx       |   3 -
 .../detail_portofolio/draft/layout.tsx        |   4 +-
 .../detail_portofolio/publish/layout.tsx      |   3 -
 .../detail_portofolio/reject/layout.tsx       |   4 -
 .../detail_portofolio/review/layout.tsx       |   3 -
 .../investasi/dialog_page/create/layout.tsx   |   6 +-
 .../dialog_page/transaksi_saham/layout.tsx    |  39 ---
 .../dialog_page/transaksi_saham/view.tsx      |  53 ---
 .../investasi/edit_berita/layout.tsx          |  14 +-
 src/app_modules/investasi/index.ts            |  28 --
 .../investasi/list_edit_berita/layout.tsx     |  15 +-
 .../investasi/metode_transfer/layout.tsx      |  24 --
 .../investasi/metode_transfer/view.tsx        | 122 -------
 .../investasi/portofolio/layout.tsx           |   8 -
 .../investasi/proses_investasi/layout.tsx     |  22 --
 .../investasi/proses_investasi/view.tsx       | 155 ---------
 .../investasi/proses_transaksi/layout.tsx     |  15 +-
 .../investasi/status_pesanan/layout.tsx       |  16 +-
 .../status_transaksi/gagal/layout.tsx         |  16 +-
 .../investasi/status_transaksi/layout.tsx     |  70 ----
 .../investasi/transaksi/layout.tsx            |   3 +-
 src/app_modules/investasi/transfer/layout.tsx |  58 ----
 src/app_modules/investasi/transfer/view.tsx   | 240 --------------
 src/app_modules/investasi/upload/layout.tsx   |  20 --
 src/app_modules/investasi/upload/view.tsx     |  39 ---
 .../investasi/upload_bukti/layout.tsx         |  20 --
 .../investasi/upload_bukti/view.tsx           | 137 --------
 .../investasi/upload_dokumen/layout.tsx       |   3 -
 .../investasi/upload_prospektus/layout.tsx    |   3 -
 .../job/component/header_tamplate.tsx         |  77 -----
 src/app_modules/job/detail/reject/layout.tsx  |   7 +-
 .../katalog/component/header_tamplate.tsx     |  70 ----
 .../katalog/component/header_transparent.tsx  |  33 --
 src/app_modules/katalog/index.ts              |   2 -
 .../katalog/portofolio/edit/layout.tsx        |  21 --
 .../katalog/portofolio/edit/logo/layout.tsx   |   3 -
 src/app_modules/katalog/portofolio/index.ts   |   2 -
 .../vote/component/header_tamplate.tsx        |  79 -----
 src/app_modules/vote/detail/draft/layout.tsx  |  12 +-
 111 files changed, 284 insertions(+), 2930 deletions(-)
 delete mode 100644 src/app/dev/admin/investasi/halaman_aksi/[id]/layout.tsx
 delete mode 100644 src/app/dev/admin/investasi/halaman_aksi/[id]/page.tsx
 delete mode 100644 src/app/dev/admin/investasi/status_transfer/layout.tsx
 delete mode 100644 src/app/dev/admin/investasi/status_transfer/page.tsx
 delete mode 100644 src/app/dev/investasi/dialog_page/transaksi_saham/layout.tsx
 delete mode 100644 src/app/dev/investasi/dialog_page/transaksi_saham/loading.tsx
 delete mode 100644 src/app/dev/investasi/dialog_page/transaksi_saham/page.tsx
 delete mode 100644 src/app/dev/investasi/edit_berita/[id]/loading.tsx
 delete mode 100644 src/app/dev/investasi/metode_transfer/[id]/layout.tsx
 delete mode 100644 src/app/dev/investasi/metode_transfer/[id]/loading.tsx
 delete mode 100644 src/app/dev/investasi/metode_transfer/[id]/page.tsx
 delete mode 100644 src/app/dev/investasi/proses_investasi/[id]/layout.tsx
 delete mode 100644 src/app/dev/investasi/proses_investasi/[id]/loading.tsx
 delete mode 100644 src/app/dev/investasi/proses_investasi/[id]/page.tsx
 delete mode 100644 src/app/dev/investasi/transfer/[id]/layout.tsx
 delete mode 100644 src/app/dev/investasi/transfer/[id]/loading.tsx
 delete mode 100644 src/app/dev/investasi/transfer/[id]/page.tsx
 delete mode 100644 src/app/dev/investasi/upload/layout.tsx
 delete mode 100644 src/app/dev/investasi/upload/loading.tsx
 delete mode 100644 src/app/dev/investasi/upload/page.tsx
 delete mode 100644 src/app/dev/investasi/upload_bukti/layout.tsx
 delete mode 100644 src/app/dev/investasi/upload_bukti/loading.tsx
 delete mode 100644 src/app/dev/investasi/upload_bukti/page.tsx
 delete mode 100644 src/app_modules/_global/header_tamplate.tsx
 delete mode 100644 src/app_modules/admin/investasi/bukti_transfer/layout.tsx
 delete mode 100644 src/app_modules/admin/investasi/bukti_transfer/view.tsx
 delete mode 100644 src/app_modules/admin/investasi/halaman_aksi/layout.tsx
 delete mode 100644 src/app_modules/admin/investasi/halaman_aksi/view.tsx
 delete mode 100644 src/app_modules/admin/investasi/konfirmasi/layout.tsx
 delete mode 100644 src/app_modules/admin/investasi/status_transfer/layout.tsx
 delete mode 100644 src/app_modules/admin/investasi/status_transfer/view.tsx
 delete mode 100644 src/app_modules/colab/component/header_tamplate.tsx
 delete mode 100644 src/app_modules/donasi/component/header_tamplate.tsx
 delete mode 100644 src/app_modules/event/component/header_tamplate.tsx
 delete mode 100644 src/app_modules/forum/component/header/header_rata_kiri.tsx
 delete mode 100644 src/app_modules/forum/component/header/header_tamplate.tsx
 delete mode 100644 src/app_modules/investasi/dialog_page/transaksi_saham/layout.tsx
 delete mode 100644 src/app_modules/investasi/dialog_page/transaksi_saham/view.tsx
 delete mode 100644 src/app_modules/investasi/metode_transfer/layout.tsx
 delete mode 100644 src/app_modules/investasi/metode_transfer/view.tsx
 delete mode 100644 src/app_modules/investasi/proses_investasi/layout.tsx
 delete mode 100644 src/app_modules/investasi/proses_investasi/view.tsx
 delete mode 100644 src/app_modules/investasi/status_transaksi/layout.tsx
 delete mode 100644 src/app_modules/investasi/transfer/layout.tsx
 delete mode 100644 src/app_modules/investasi/transfer/view.tsx
 delete mode 100644 src/app_modules/investasi/upload/layout.tsx
 delete mode 100644 src/app_modules/investasi/upload/view.tsx
 delete mode 100644 src/app_modules/investasi/upload_bukti/layout.tsx
 delete mode 100644 src/app_modules/investasi/upload_bukti/view.tsx
 delete mode 100644 src/app_modules/job/component/header_tamplate.tsx
 delete mode 100644 src/app_modules/katalog/component/header_tamplate.tsx
 delete mode 100644 src/app_modules/katalog/component/header_transparent.tsx
 delete mode 100644 src/app_modules/katalog/portofolio/edit/layout.tsx
 delete mode 100644 src/app_modules/vote/component/header_tamplate.tsx

diff --git a/src/app/dev/admin/investasi/halaman_aksi/[id]/layout.tsx b/src/app/dev/admin/investasi/halaman_aksi/[id]/layout.tsx
deleted file mode 100644
index c769c7ad..00000000
--- a/src/app/dev/admin/investasi/halaman_aksi/[id]/layout.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-import { Admin_LayoutHalamanAksi } from "@/app_modules/admin/investasi";
-import React from "react";
-
-export default async function Layout({ children }: { children: React.ReactNode }) {
-  return <>
-  <Admin_LayoutHalamanAksi>{children}</Admin_LayoutHalamanAksi>
-  </>;
-}
diff --git a/src/app/dev/admin/investasi/halaman_aksi/[id]/page.tsx b/src/app/dev/admin/investasi/halaman_aksi/[id]/page.tsx
deleted file mode 100644
index 4d899bd7..00000000
--- a/src/app/dev/admin/investasi/halaman_aksi/[id]/page.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Admin_HalamanAksi } from "@/app_modules/admin/investasi";
-
-export default async function Page({params}:{params: {id: string}}) {
-
-  return (
-    <>
-      <Admin_HalamanAksi idInves={params.id} />
-    </>
-  );
-}
diff --git a/src/app/dev/admin/investasi/status_transfer/layout.tsx b/src/app/dev/admin/investasi/status_transfer/layout.tsx
deleted file mode 100644
index 549f12ff..00000000
--- a/src/app/dev/admin/investasi/status_transfer/layout.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Admin_LayoutStatusTransferInvesatasi } from "@/app_modules/admin/investasi";
-import React from "react";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <Admin_LayoutStatusTransferInvesatasi>
-        {children}
-      </Admin_LayoutStatusTransferInvesatasi>
-    </>
-  );
-}
diff --git a/src/app/dev/admin/investasi/status_transfer/page.tsx b/src/app/dev/admin/investasi/status_transfer/page.tsx
deleted file mode 100644
index 8a5203a3..00000000
--- a/src/app/dev/admin/investasi/status_transfer/page.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Admin_StatusTransferInvesatasi } from "@/app_modules/admin/investasi";
-
-export default async function Page() {
-    return<>
-    <Admin_StatusTransferInvesatasi/>
-    </>
-    
-}
\ No newline at end of file
diff --git a/src/app/dev/admin/layout.tsx b/src/app/dev/admin/layout.tsx
index 6ce8149c..bdf7d0c0 100644
--- a/src/app/dev/admin/layout.tsx
+++ b/src/app/dev/admin/layout.tsx
@@ -6,7 +6,7 @@ import adminNotifikasi_getByUserId from "@/app_modules/admin/notifikasi/fun/get/
 import React from "react";
 import versionUpdate from "../../../../package.json";
 
-export default async function Layout({
+export  default async function Layout({
   children,
 }: {
   children: React.ReactNode;
diff --git a/src/app/dev/investasi/dialog_page/transaksi_saham/layout.tsx b/src/app/dev/investasi/dialog_page/transaksi_saham/layout.tsx
deleted file mode 100644
index 9184d8ea..00000000
--- a/src/app/dev/investasi/dialog_page/transaksi_saham/layout.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import LayoutCountDownTransaksiInvestasi from "@/app_modules/investasi/dialog_page/transaksi_saham/layout";
-import React from "react";
-
-export default async function Layout({children}: {children: React.ReactNode}) {
-    return<>
-    <LayoutCountDownTransaksiInvestasi>{children}</LayoutCountDownTransaksiInvestasi>
-    </>
-}
\ No newline at end of file
diff --git a/src/app/dev/investasi/dialog_page/transaksi_saham/loading.tsx b/src/app/dev/investasi/dialog_page/transaksi_saham/loading.tsx
deleted file mode 100644
index d8a1c040..00000000
--- a/src/app/dev/investasi/dialog_page/transaksi_saham/loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage/>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/dialog_page/transaksi_saham/page.tsx b/src/app/dev/investasi/dialog_page/transaksi_saham/page.tsx
deleted file mode 100644
index 9dec4842..00000000
--- a/src/app/dev/investasi/dialog_page/transaksi_saham/page.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { KonfirmasiBuktiInvestasi } from "@/app_modules/investasi";
-
-export default async function Page() {
-    return <>
-    <KonfirmasiBuktiInvestasi/>
-    </>
-}
\ No newline at end of file
diff --git a/src/app/dev/investasi/edit_berita/[id]/loading.tsx b/src/app/dev/investasi/edit_berita/[id]/loading.tsx
deleted file mode 100644
index d8a1c040..00000000
--- a/src/app/dev/investasi/edit_berita/[id]/loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage/>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/metode_transfer/[id]/layout.tsx b/src/app/dev/investasi/metode_transfer/[id]/layout.tsx
deleted file mode 100644
index eb622d97..00000000
--- a/src/app/dev/investasi/metode_transfer/[id]/layout.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { LayoutMetodeTransferInvestasi } from "@/app_modules/investasi";
-import React from "react";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <LayoutMetodeTransferInvestasi>{children}</LayoutMetodeTransferInvestasi>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/metode_transfer/[id]/loading.tsx b/src/app/dev/investasi/metode_transfer/[id]/loading.tsx
deleted file mode 100644
index d8a1c040..00000000
--- a/src/app/dev/investasi/metode_transfer/[id]/loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage/>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/metode_transfer/[id]/page.tsx b/src/app/dev/investasi/metode_transfer/[id]/page.tsx
deleted file mode 100644
index f97e4b94..00000000
--- a/src/app/dev/investasi/metode_transfer/[id]/page.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { MetodeTransferInvestasi } from "@/app_modules/investasi";
-import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id";
-import getMaster_NamaBank from "@/app_modules/investasi/fun/master/get_nama_bank";
-
-import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
-
-export default async function Page({ params }: { params: { id: string } }) {
-  const userLoginId = await funGetUserIdByToken();
-
-  const dataInvestasi = await getOneInvestasiById(params.id);
-  const namaBank = await getMaster_NamaBank();
-  // console.log(namaBank)
-  return (
-    <>
-      <MetodeTransferInvestasi
-        dataInvestasi={dataInvestasi as any}
-        namaBank={namaBank as any}
-        authorId={userLoginId}
-      />
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/proses_investasi/[id]/layout.tsx b/src/app/dev/investasi/proses_investasi/[id]/layout.tsx
deleted file mode 100644
index 2d8b6959..00000000
--- a/src/app/dev/investasi/proses_investasi/[id]/layout.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { LayoutProsesInvestasi } from "@/app_modules/investasi";
-import React from "react";
-
-export default async function Layout({children}: {children: React.ReactNode}) {
-    return<>
-    <LayoutProsesInvestasi>{children}</LayoutProsesInvestasi>
-    </>
-}
\ No newline at end of file
diff --git a/src/app/dev/investasi/proses_investasi/[id]/loading.tsx b/src/app/dev/investasi/proses_investasi/[id]/loading.tsx
deleted file mode 100644
index d8a1c040..00000000
--- a/src/app/dev/investasi/proses_investasi/[id]/loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage/>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/proses_investasi/[id]/page.tsx b/src/app/dev/investasi/proses_investasi/[id]/page.tsx
deleted file mode 100644
index c77a06a0..00000000
--- a/src/app/dev/investasi/proses_investasi/[id]/page.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ProsesInvestasi } from "@/app_modules/investasi";
-import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id";
-
-export default async function Page({params}: {params: {id: string}}) {
-
-    const dataInvestasi = await getOneInvestasiById(params.id)
-
-    return<>
-    <ProsesInvestasi dataInvestasi={dataInvestasi as any}/>
-    </>
-}
\ No newline at end of file
diff --git a/src/app/dev/investasi/transfer/[id]/layout.tsx b/src/app/dev/investasi/transfer/[id]/layout.tsx
deleted file mode 100644
index a5a1a6b9..00000000
--- a/src/app/dev/investasi/transfer/[id]/layout.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { LayoutTransferInvestasi } from "@/app_modules/investasi";
-import React from "react";
-
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <LayoutTransferInvestasi>{children}</LayoutTransferInvestasi>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/transfer/[id]/loading.tsx b/src/app/dev/investasi/transfer/[id]/loading.tsx
deleted file mode 100644
index d8a1c040..00000000
--- a/src/app/dev/investasi/transfer/[id]/loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage/>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/transfer/[id]/page.tsx b/src/app/dev/investasi/transfer/[id]/page.tsx
deleted file mode 100644
index 7c89ddce..00000000
--- a/src/app/dev/investasi/transfer/[id]/page.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { TransferInvestasi } from "@/app_modules/investasi";
-import funCountDown from "@/app_modules/investasi/fun/fun_countdown_investasi";
-import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id";
-import getTransaksiByIdInvestasi from "@/app_modules/investasi/fun/get_transaksi_investasi";
-
-export default async function Page({ params }: { params: { id: string } }) {
-  const dataTransaksi = await getTransaksiByIdInvestasi(params.id);
-  // const cd = await funCountDown(params.id)
-  // console.log(dataTransaksi)
-  // const cd = await funCountDown("" + dataTransaksi?.id);
-
-  return (
-    <>
-      <TransferInvestasi dataTransaksi={dataTransaksi as any} />
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/upload/layout.tsx b/src/app/dev/investasi/upload/layout.tsx
deleted file mode 100644
index f0dc3953..00000000
--- a/src/app/dev/investasi/upload/layout.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { LayoutUploadGambarInvestasi } from "@/app_modules/investasi";
-import React from "react";
-
-export default async function Layout({children}: {children: React.ReactNode}) {
-    return<>
-    <LayoutUploadGambarInvestasi>{children}</LayoutUploadGambarInvestasi>
-    </>
-}
\ No newline at end of file
diff --git a/src/app/dev/investasi/upload/loading.tsx b/src/app/dev/investasi/upload/loading.tsx
deleted file mode 100644
index d8a1c040..00000000
--- a/src/app/dev/investasi/upload/loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage/>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/upload/page.tsx b/src/app/dev/investasi/upload/page.tsx
deleted file mode 100644
index 96feb763..00000000
--- a/src/app/dev/investasi/upload/page.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { UploadGambarInvestasi } from "@/app_modules/investasi";
-
-export default async function Page() {
-    return<>
-    <UploadGambarInvestasi/>
-    </>
-}
\ No newline at end of file
diff --git a/src/app/dev/investasi/upload_bukti/layout.tsx b/src/app/dev/investasi/upload_bukti/layout.tsx
deleted file mode 100644
index 2e61e6c1..00000000
--- a/src/app/dev/investasi/upload_bukti/layout.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { LayoutBuktiTransferInvestasi } from "@/app_modules/investasi";
-import React from "react";
-
-export default async function Layout({children}: {children: React.ReactNode}) {
-    return<>
-    <LayoutBuktiTransferInvestasi>{children}</LayoutBuktiTransferInvestasi>
-    </>
-}
\ No newline at end of file
diff --git a/src/app/dev/investasi/upload_bukti/loading.tsx b/src/app/dev/investasi/upload_bukti/loading.tsx
deleted file mode 100644
index d8a1c040..00000000
--- a/src/app/dev/investasi/upload_bukti/loading.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-
-export default async function Page() {
-  return (
-    <>
-      <ComponentGlobal_V2_LoadingPage/>
-    </>
-  );
-}
diff --git a/src/app/dev/investasi/upload_bukti/page.tsx b/src/app/dev/investasi/upload_bukti/page.tsx
deleted file mode 100644
index 681868f8..00000000
--- a/src/app/dev/investasi/upload_bukti/page.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { UploadBuktiTransferInvestasi } from "@/app_modules/investasi";
-
-export default async function Page() {
-  return <UploadBuktiTransferInvestasi />;
-}
diff --git a/src/app/dev/layout.tsx b/src/app/dev/layout.tsx
index 356bf2cc..b824b8d4 100644
--- a/src/app/dev/layout.tsx
+++ b/src/app/dev/layout.tsx
@@ -1,10 +1,7 @@
+"use client";
 import { CheckCookies_UiLayout } from "@/app_modules/check_cookies";
 
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
+export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <>
       <CheckCookies_UiLayout>{children}</CheckCookies_UiLayout>
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 437df065..af5e5657 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,6 +1,6 @@
 import MqttLoader from "@/util/mqtt_loader";
 import RootStyleRegistry from "./emotion";
-import "./globals.css";
+// import "./globals.css";
 import { TokenProvider } from "./lib/token";
 import dotenv from "dotenv";
 import { ServerEnv } from "./lib/server_env";
diff --git a/src/app_modules/_global/header_tamplate.tsx b/src/app_modules/_global/header_tamplate.tsx
deleted file mode 100644
index 485b0683..00000000
--- a/src/app_modules/_global/header_tamplate.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-"use client";
-
-import { Header, Group, ActionIcon, Text, Title } from "@mantine/core";
-import { IconArrowLeft, IconChevronLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-
-export default function ComponentGlobal_HeaderTamplate({
-  route,
-  route2,
-  title,
-  icon,
-}: {
-  route?: any;
-  route2?: any;
-  title: string;
-  icon?: any;
-}) {
-  const router = useRouter();
-  const [isLoading, setIsLoading] = useState(false);
-  const [isRightLoading, setRightLoading] = useState(false);
-
-  return (
-    <>
-      <Header height={50} sx={{ borderStyle: "none" }}>
-        <Group h={50} position="apart" px={"md"}>
-          <ActionIcon
-            loading={isLoading ? true : false}
-            variant="transparent"
-            onClick={() => {
-              setIsLoading(true);
-              if (route === null || route === undefined) {
-                return router.back();
-              } else {
-                return router.push(route);
-              }
-            }}
-          >
-            <IconChevronLeft />
-          </ActionIcon>
-          <Title order={5}>{title}</Title>
-          {(() => {
-            if (route2 === null || route2 === undefined) {
-              return <ActionIcon disabled variant="transparent"></ActionIcon>;
-            } else {
-              return (
-                <ActionIcon
-                  loading={isRightLoading ? true : false}
-                  variant="transparent"
-                  onClick={() => {
-                    setRightLoading(true);
-                    router.push(route2);
-                  }}
-                >
-                  {icon}
-                </ActionIcon>
-              );
-            }
-          })()}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/_global/ui/ui_header_tamplate.tsx b/src/app_modules/_global/ui/ui_header_tamplate.tsx
index 6a1873bf..6126711c 100644
--- a/src/app_modules/_global/ui/ui_header_tamplate.tsx
+++ b/src/app_modules/_global/ui/ui_header_tamplate.tsx
@@ -47,11 +47,15 @@ export default function UIGlobal_LayoutHeaderTamplate({
 
   return (
     <>
-      <Header
-        height={"8vh"}
+      <Box
+        h={"8vh"}
+        // w={"100%"}
+        // pos={"sticky"}
+        // top={0}
+        // style={{
+        //   zIndex: 10,
+        // }}
         sx={{
-          //   borderRadius: "0px 0px 20px 20px",
-          //   borderBottom: `1px solid ${AccentColor.blue}`,
           borderStyle: "none",
         }}
         bg={backgroundColor ? backgroundColor : MainColor.darkblue}
@@ -110,7 +114,7 @@ export default function UIGlobal_LayoutHeaderTamplate({
             </ActionIcon>
           )}
         </Group>
-      </Header>
+      </Box>
     </>
   );
 }
diff --git a/src/app_modules/_global/ui/ui_layout_tamplate.tsx b/src/app_modules/_global/ui/ui_layout_tamplate.tsx
index 6327fc97..393a8f25 100644
--- a/src/app_modules/_global/ui/ui_layout_tamplate.tsx
+++ b/src/app_modules/_global/ui/ui_layout_tamplate.tsx
@@ -5,7 +5,7 @@ import {
   Box,
   Container,
   rem,
-  ScrollArea
+  ScrollArea,
 } from "@mantine/core";
 import React from "react";
 import { AccentColor, MainColor } from "../color/color_pallet";
@@ -16,7 +16,7 @@ export default function UIGlobal_LayoutTamplate({
   footer,
 }: {
   children: React.ReactNode;
-  header?: React.ReactNode;
+  header: React.ReactNode;
   footer?: React.ReactNode;
 }) {
   return (
@@ -52,21 +52,18 @@ export default function UIGlobal_LayoutTamplate({
 export function UIHeader({ header }: { header: React.ReactNode }) {
   return (
     <>
-      {header ? (
-        <Box
-          h={"8vh"}
-          style={{
-            zIndex: 10,
-          }}
-          w={"100%"}
-          pos={"sticky"}
-          top={0}
-        >
-          {header}
-        </Box>
-      ) : (
-        ""
-      )}
+      <Box
+        h={"8vh"}
+        style={{
+          zIndex: 10,
+          alignContent: "center",
+        }}
+        w={"100%"}
+        pos={"sticky"}
+        top={0}
+      >
+        {header}
+      </Box>
     </>
   );
 }
diff --git a/src/app_modules/_global/ui/ui_splash.tsx b/src/app_modules/_global/ui/ui_splash.tsx
index 80fbc09e..0dc8657b 100644
--- a/src/app_modules/_global/ui/ui_splash.tsx
+++ b/src/app_modules/_global/ui/ui_splash.tsx
@@ -1,19 +1,19 @@
 "use client";
 
 import { Loader, Stack, ThemeIcon } from "@mantine/core";
-import UIGlobal_LayoutTamplate from "./ui_layout_tamplate";
+import UIGlobal_LayoutDefault from "./ui_layout_default";
 
 export default function UIGlobal_SplashScreen({ icon }: { icon: any }) {
   return (
     <>
-      <UIGlobal_LayoutTamplate>
+      <UIGlobal_LayoutDefault>
         <Stack h={"90vh"} align="center" justify="center" spacing={"xl"}>
           <ThemeIcon variant="transparent" size={300} c="white">
             {icon}
           </ThemeIcon>
           <Loader variant="dots" color="white" />
         </Stack>
-      </UIGlobal_LayoutTamplate>
+      </UIGlobal_LayoutDefault>
     </>
   );
 }
diff --git a/src/app_modules/admin/investasi/bukti_transfer/layout.tsx b/src/app_modules/admin/investasi/bukti_transfer/layout.tsx
deleted file mode 100644
index 3b0c4f86..00000000
--- a/src/app_modules/admin/investasi/bukti_transfer/layout.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-"use client";
-
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell } from "@mantine/core";
-import React from "react";
-
-export default function Admin_LayoutBuktiTransferInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <AppShell header={<ComponentGlobal_HeaderTamplate title="Bukti Transfer" />}>
-        {children}
-      </AppShell>
-    </>
-  );
-}
diff --git a/src/app_modules/admin/investasi/bukti_transfer/view.tsx b/src/app_modules/admin/investasi/bukti_transfer/view.tsx
deleted file mode 100644
index 0d5e6817..00000000
--- a/src/app_modules/admin/investasi/bukti_transfer/view.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-"use client";
-
-import { RouterAdminInvestasi_OLD } from "@/app/lib/router_hipmi/router_admin";
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import {
-  Avatar,
-  Badge,
-  Grid,
-  Group,
-  Paper,
-  Text,
-  ThemeIcon,
-  Title,
-} from "@mantine/core";
-import { IconChevronRight } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-
-export default function Admin_BuktiTransferInvestasi() {
-  const router = useRouter();
-  const listUsername = [
-    {
-      id: 1,
-    },
-    {
-      id: 2,
-    },
-    {
-      id: 3,
-    },
-    {
-      id: 4,
-    },
-    {
-      id: 5,
-    },
-    {
-      id: 6,
-    },
-  ];
-  return (
-    <>
-      {/* Box Username */}
-      {listUsername.map((e) => (
-        <Paper
-          key={e.id}
-          bg={"gray"}
-          p={"md"}
-          mb={"xs"}
-          onClick={() => router.push(RouterAdminInvestasi_OLD.status_transfer)}
-        >
-          <Grid align="center">
-            <Grid.Col span={6}>
-              <Text>Username</Text>
-            </Grid.Col>
-            <Grid.Col span={4}>
-              <Badge variant="dot">Status Transfer</Badge>
-            </Grid.Col>
-          </Grid>
-        </Paper>
-      ))}
-    </>
-  );
-}
diff --git a/src/app_modules/admin/investasi/detail/detail_review.tsx b/src/app_modules/admin/investasi/detail/detail_review.tsx
index 509f53b9..7db97675 100644
--- a/src/app_modules/admin/investasi/detail/detail_review.tsx
+++ b/src/app_modules/admin/investasi/detail/detail_review.tsx
@@ -217,25 +217,7 @@ export default function AdminInvestasi_DetailReview({
         }
       />
 
-      {/* <Modal
-        opened={openModal}
-        onClose={() => setOpenModal(false)}
-        title="Alasan Penolakan"
-        size={"sm"}
-        centered
-        withCloseButton={false}
-      >
-        <Stack>
-          <Textarea
-            autosize
-            minRows={3}
-            maxRows={5}
-            placeholder="Masukan alasan penolakan"
-            onChange={(val) => setReport(val.target.value)}
-          />
-          <Group position="right"></Group>
-        </Stack>
-      </Modal> */}
+  
     </>
   );
 }
diff --git a/src/app_modules/admin/investasi/halaman_aksi/layout.tsx b/src/app_modules/admin/investasi/halaman_aksi/layout.tsx
deleted file mode 100644
index c377be43..00000000
--- a/src/app_modules/admin/investasi/halaman_aksi/layout.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-"use client";
-
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell } from "@mantine/core";
-import React from "react";
-
-export default function Admin_LayoutHalamanAksi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      {/* {children} */}
-      <AppShell padding={"md"} header={<ComponentGlobal_HeaderTamplate title="Pilih Aksi" />}>
-        {children}
-      </AppShell>
-    </>
-  );
-}
diff --git a/src/app_modules/admin/investasi/halaman_aksi/view.tsx b/src/app_modules/admin/investasi/halaman_aksi/view.tsx
deleted file mode 100644
index 3334db96..00000000
--- a/src/app_modules/admin/investasi/halaman_aksi/view.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-"use client";
-
-import { RouterAdminInvestasi_OLD } from "@/app/lib/router_hipmi/router_admin";
-import {
-  Box,
-  Button,
-  Center,
-  Flex,
-  Grid,
-  Group,
-  Paper,
-  SimpleGrid,
-  Stack,
-  Text,
-  Title,
-} from "@mantine/core";
-import { IconChevronRight } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-
-export default function Admin_HalamanAksi({idInves}: {idInves: string}) {
-  const router = useRouter();
-  const listHalamanAksi = [
-    {
-      id: 1,
-      name: "Konfirmasi",
-      desc: "Publis atau non - aktifkan proyek invetsasi",
-      route: RouterAdminInvestasi_OLD.konfirmasi,
-    },
-    {
-      id: 2,
-      name: "Bukti Transfer",
-      desc: "Lihat bukti transfer investor",
-      route: RouterAdminInvestasi_OLD.bukti_transfer,
-    },
-  ];
-
-  return (
-    <>
-      <SimpleGrid
-        cols={4}
-        spacing="sm"
-        breakpoints={[
-          // { maxWidth: "lg", cols: 6, spacing: "lg" },
-          { maxWidth: "md", cols: 3, spacing: "md" },
-          { maxWidth: "sm", cols: 2, spacing: "sm" },
-          { maxWidth: "xs", cols: 1, spacing: "xs" },
-        ]}
-      >
-        {listHalamanAksi.map((e) => (
-          <Paper key={e.id} bg={"gray"} p={"sm"}>
-            <Stack>
-              <Stack spacing={0}>
-                <Title order={6}>{e.name}</Title>
-                <Text fz={"sm"}>{e.desc}</Text>
-              </Stack>
-              <Center>
-                <Button
-                  compact
-                  radius={50}
-                  w={100}
-                  onClick={() => router.push(e.route + `${idInves}`)}
-                >
-                  Lihat
-                </Button>
-              </Center>
-            </Stack>
-          </Paper>
-        ))}
-      </SimpleGrid>
-      {/* <Grid mb={"md"} align="center">
-        {listHalamanAksi.map((e) => (
-          <Grid.Col key={e.id} onClick={() => router.push(e.route)}>
-            <Paper bg={"gray"} p={"xs"}>
-              <Grid align="center">
-                <Grid.Col span={10}>
-                  <Stack spacing={0}>
-                    <Title order={5}>{e.name}</Title>
-                    <Text fw={"lighter"} fz={"xs"}>
-                      {e.desc}
-                    </Text>
-                  </Stack>
-                </Grid.Col>
-                <Grid.Col span={2}>
-                  <IconChevronRight />
-                </Grid.Col>
-              </Grid>
-            </Paper>
-          </Grid.Col>
-        ))}
-      </Grid> */}
-    </>
-  );
-}
diff --git a/src/app_modules/admin/investasi/index.tsx b/src/app_modules/admin/investasi/index.tsx
index d07ef14e..fed56bfd 100644
--- a/src/app_modules/admin/investasi/index.tsx
+++ b/src/app_modules/admin/investasi/index.tsx
@@ -1,32 +1,18 @@
-import Admin_Investasi from "./main/view";
-import Admin_HalamanAksi from "./halaman_aksi/view";
-import Admin_LayoutHalamanAksi from "./halaman_aksi/layout";
-import AdminInvestasi_DetailReview from "./detail/detail_review";
-import Admin_LayoutKonfirmasiInvestasi from "./konfirmasi/layout";
-import Admin_BuktiTransferInvestasi from "./bukti_transfer/view";
-import Admin_LayoutBuktiTransferInvestasi from "./bukti_transfer/layout";
-import Admin_StatusTransferInvesatasi from "./status_transfer/view";
-import Admin_LayoutStatusTransferInvesatasi from "./status_transfer/layout";
-import Admin_TableReviewInvestasi from "./main/table_review";
-import Admin_TablePublishInvestasi from "./main/table_publish";
-import Admin_TableRejectInvestasi from "./main/table_reject";
 import { AdminInvestasi_DetailPublish } from "./detail/detail_publish";
 import { AdminInvestasi_DetailReject } from "./detail/detail_reject";
- 
+import AdminInvestasi_DetailReview from "./detail/detail_review";
+import Admin_TablePublishInvestasi from "./main/table_publish";
+import Admin_TableRejectInvestasi from "./main/table_reject";
+import Admin_TableReviewInvestasi from "./main/table_review";
+import Admin_Investasi from "./main/view";
 
 export {
   Admin_Investasi,
-  Admin_HalamanAksi,
-  Admin_LayoutHalamanAksi,
   AdminInvestasi_DetailReview as Admin_KonfirmasiInvestasi,
-  Admin_LayoutKonfirmasiInvestasi,
-  Admin_BuktiTransferInvestasi,
-  Admin_LayoutBuktiTransferInvestasi,
-  Admin_StatusTransferInvesatasi,
-  Admin_LayoutStatusTransferInvesatasi,
   Admin_TablePublishInvestasi,
-  Admin_TableReviewInvestasi,
   Admin_TableRejectInvestasi,
+  Admin_TableReviewInvestasi,
   AdminInvestasi_DetailPublish,
-  AdminInvestasi_DetailReject,
+  AdminInvestasi_DetailReject
 };
+
diff --git a/src/app_modules/admin/investasi/konfirmasi/layout.tsx b/src/app_modules/admin/investasi/konfirmasi/layout.tsx
deleted file mode 100644
index 23a5fd39..00000000
--- a/src/app_modules/admin/investasi/konfirmasi/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-"use client";
-
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell } from "@mantine/core";
-import React from "react";
-
-export default function Admin_LayoutKonfirmasiInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <AppShell
-        header={<ComponentGlobal_HeaderTamplate title="Konfimasi Investasi" />}
-      >
-        {children}
-      </AppShell>
-    </>
-  );
-}
diff --git a/src/app_modules/admin/investasi/status_transfer/layout.tsx b/src/app_modules/admin/investasi/status_transfer/layout.tsx
deleted file mode 100644
index 21088daa..00000000
--- a/src/app_modules/admin/investasi/status_transfer/layout.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-"use client";
-
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell } from "@mantine/core";
-import React from "react";
-
-export default function Admin_LayoutStatusTransferInvesatasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <AppShell header={<ComponentGlobal_HeaderTamplate title="Status Transfer" />}>
-        {children}
-      </AppShell>
-    </>
-  );
-}
diff --git a/src/app_modules/admin/investasi/status_transfer/view.tsx b/src/app_modules/admin/investasi/status_transfer/view.tsx
deleted file mode 100644
index 843b3ee6..00000000
--- a/src/app_modules/admin/investasi/status_transfer/view.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-"use client";
-
-import { Warna } from "@/app/lib/warna";
-import {
-  AspectRatio,
-  Avatar,
-  Button,
-  Center,
-  Group,
-  Image,
-  Select,
-  Stack,
-  Text,
-  Title,
-} from "@mantine/core";
-import { useRouter } from "next/navigation";
-
-export default function Admin_StatusTransferInvesatasi() {
-  const router = useRouter();
-  return (
-    <>
-      <Stack>
-        <Group>
-          <Avatar variant="outline" radius={50} />
-          <Text>Username</Text>
-        </Group>
-
-        <Select
-          label="Status investor"
-          data={[
-            { value: "1", label: "Sudah Transfer" },
-            { value: "2", label: "Menunggu Transfer" },
-          ]}
-        />
-
-        <Center>
-          <AspectRatio ratio={1 / 1} bg={"blue"} h={400} w={250}>
-            <Image alt="" height={400} w={200} src={"/aset/no-img.png"} />
-          </AspectRatio>
-        </Center>
-
-        <Center mt={"lg"}>
-          <Button
-            w={300}
-            radius={50}
-            bg={Warna.biru}
-            color="blue"
-            onClick={() => {
-              router.back();
-            }}
-          >
-            Simpan
-          </Button>
-        </Center>
-      </Stack>
-    </>
-  );
-}
diff --git a/src/app_modules/admin/layout.tsx b/src/app_modules/admin/layout.tsx
index fe2a1dec..e7c150a7 100644
--- a/src/app_modules/admin/layout.tsx
+++ b/src/app_modules/admin/layout.tsx
@@ -1,48 +1,19 @@
 "use client";
 
-import mqtt_client from "@/util/mqtt_client";
 import {
-  ActionIcon,
-  AppShell,
   Box,
-  Burger,
-  Center,
-  Divider,
-  Drawer,
-  Group,
-  Header,
-  Indicator,
-  MediaQuery,
-  NavLink,
-  Navbar,
-  ScrollArea,
-  Stack,
-  Text,
-  Title,
-  useMantineTheme,
+  useMantineTheme
 } from "@mantine/core";
-import {
-  IconBell,
-  IconCircleDot,
-  IconCircleDotFilled,
-  IconUserSquareRounded,
-} from "@tabler/icons-react";
 import { useAtom } from "jotai";
-import _ from "lodash";
 import { useRouter } from "next/navigation";
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { MODEL_USER } from "../home/model/interface";
 import { MODEL_NOTIFIKASI } from "../notifikasi/model/interface";
-import Admin_Logout from "./_admin_global/logout";
 import {
   gs_admin_hotMenu,
   gs_admin_subMenu,
   gs_layout_admin_isNavbarOpen,
 } from "./global_state";
-import { listAdminPage } from "./list_page";
-import adminNotifikasi_getByUserId from "./notifikasi/fun/get/get_notifikasi_by_user_id";
-import { ComponentAdmin_UIDrawerNotifikasi } from "./notifikasi/ui_drawer_notifikasi";
-import { AccentColor, MainColor } from "../_global/color";
 
 export default function AdminLayout({
   children,
@@ -71,142 +42,145 @@ export default function AdminLayout({
   const [countNotif, setCountNotif] = useState(countNotifikasi);
   const [isNavbarOpen, setIsNavbarOpen] = useAtom(gs_layout_admin_isNavbarOpen);
 
-  const developerNavbar = listAdminPage.map((e, i) => (
-    <Box key={e.id}>
-      <NavLink
-        style={{ color: "white" }}
-        sx={{
-          ":hover": {
-            backgroundColor: "transparent",
-          },
-        }}
-        fw={activeId === e.id ? "bold" : "normal"}
-        icon={
-          // active === e.id ? loading ? <Loader size={10} /> : e.icon : e.icon
-          e.icon
-        }
-        label={<Text size={"sm"}>{e.name}</Text>}
-        onClick={() => {
-          setLoading(true);
-          setActiveId(e.id);
-          setActiveChild(null);
-          e.path === "" ? router.push(e.child[0].path) : router.push(e.path);
-          e.path === "" ? setActiveChild(e.child[0].id) : "";
-        }}
-      >
-        {_.isEmpty(e.child) ? (
-          ""
-        ) : (
-          <Box>
-            {e.child.map((v, ii) => (
-              <Box key={v.id}>
-                <NavLink
-                  style={{ color: "white" }}
-                  sx={{
-                    ":hover": {
-                      backgroundColor: "transparent",
-                    },
-                  }}
-                  fw={activeChild === v.id ? "bold" : "normal"}
-                  label={<Text>{v.name}</Text>}
-                  icon={
-                    activeChild === v.id ? (
-                      <IconCircleDotFilled size={10} />
-                    ) : (
-                      <IconCircleDot size={10} />
-                    )
-                  }
-                  onClick={() => {
-                    setActiveId(e.id);
-                    setActiveChild(v.id);
-                    router.push(v.path);
-                  }}
-                />
-              </Box>
-            ))}
-          </Box>
-        )}
-      </NavLink>
-    </Box>
-  ));
+  // const developerNavbar = listAdminPage.map((e, i) => (
+  //   <Box key={e.id}>
+  //     <NavLink
+  //       style={{ color: "white" }}
+  //       sx={{
+  //         ":hover": {
+  //           backgroundColor: "transparent",
+  //         },
+  //       }}
+  //       fw={activeId === e.id ? "bold" : "normal"}
+  //       icon={
+  //         // active === e.id ? loading ? <Loader size={10} /> : e.icon : e.icon
+  //         e.icon
+  //       }
+  //       label={<Text size={"sm"}>{e.name}</Text>}
+  //       onClick={() => {
+  //         setLoading(true);
+  //         setActiveId(e.id);
+  //         setActiveChild(null);
+  //         e.path === "" ? router.push(e.child[0].path) : router.push(e.path);
+  //         e.path === "" ? setActiveChild(e.child[0].id) : "";
+  //       }}
+  //     >
+  //       {_.isEmpty(e.child) ? (
+  //         ""
+  //       ) : (
+  //         <Box>
+  //           {e.child.map((v, ii) => (
+  //             <Box key={v.id}>
+  //               <NavLink
+  //                 style={{ color: "white" }}
+  //                 sx={{
+  //                   ":hover": {
+  //                     backgroundColor: "transparent",
+  //                   },
+  //                 }}
+  //                 fw={activeChild === v.id ? "bold" : "normal"}
+  //                 label={<Text>{v.name}</Text>}
+  //                 icon={
+  //                   activeChild === v.id ? (
+  //                     <IconCircleDotFilled size={10} />
+  //                   ) : (
+  //                     <IconCircleDot size={10} />
+  //                   )
+  //                 }
+  //                 onClick={() => {
+  //                   setActiveId(e.id);
+  //                   setActiveChild(v.id);
+  //                   router.push(v.path);
+  //                 }}
+  //               />
+  //             </Box>
+  //           ))}
+  //         </Box>
+  //       )}
+  //     </NavLink>
+  //   </Box>
+  // ));
 
-  const bukanDeveloper = listAdminPage.slice(0, -1);
-  const adminNavbar = bukanDeveloper.map((e) => (
-    <Box key={e.id}>
-      <NavLink
-        style={{ color: "white" }}
-        opened={e?.id === activeId && isNavbarOpen ? true : false}
-        sx={{
-          ":hover": {
-            backgroundColor: "transparent",
-          },
-        }}
-        fw={activeId === e.id ? "bold" : "normal"}
-        icon={e.icon}
-        label={<Text size={"sm"}>{e.name}</Text>}
-        onClick={() => {
-          setLoading(true);
-          setActiveId(e.id);
-          setActiveChild(null);
-          e.path === "" ? router.push(e.child[0].path) : router.push(e.path);
-          e.path === "" ? setActiveChild(e.child[0].id) : "";
+  // const bukanDeveloper = listAdminPage.slice(0, -1);
+  // const adminNavbar = bukanDeveloper.map((e) => (
+  //   <Box key={e.id}>
+  //     <NavLink
+  //       style={{ color: "white" }}
+  //       opened={e?.id === activeId && isNavbarOpen ? true : false}
+  //       sx={{
+  //         ":hover": {
+  //           backgroundColor: "transparent",
+  //         },
+  //       }}
+  //       fw={activeId === e.id ? "bold" : "normal"}
+  //       icon={e.icon}
+  //       label={<Text size={"sm"}>{e.name}</Text>}
+  //       onClick={() => {
+  //         setLoading(true);
+  //         setActiveId(e.id);
+  //         setActiveChild(null);
+  //         e.path === "" ? router.push(e.child[0].path) : router.push(e.path);
+  //         e.path === "" ? setActiveChild(e.child[0].id) : "";
 
-          setIsNavbarOpen(true);
-        }}
-      >
-        {_.isEmpty(e.child) ? (
-          ""
-        ) : (
-          <Box>
-            {e.child.map((v, ii) => (
-              <Box key={v.id}>
-                <NavLink
-                  sx={{
-                    ":hover": {
-                      backgroundColor: "transparent",
-                    },
-                  }}
-                  fw={activeChild === v.id ? "bold" : "normal"}
-                  label={<Text>{v.name}</Text>}
-                  icon={
-                    activeChild === v.id ? (
-                      <IconCircleDotFilled size={10} />
-                    ) : (
-                      <IconCircleDot size={10} />
-                    )
-                  }
-                  onClick={() => {
-                    setActiveId(e.id);
-                    setActiveChild(v.id);
-                    router.push(v.path);
-                  }}
-                />
-              </Box>
-            ))}
-          </Box>
-        )}
-      </NavLink>
-    </Box>
-  ));
+  //         setIsNavbarOpen(true);
+  //       }}
+  //     >
+  //       {_.isEmpty(e.child) ? (
+  //         ""
+  //       ) : (
+  //         <Box>
+  //           {e.child.map((v, ii) => (
+  //             <Box key={v.id}>
+  //               <NavLink
+  //                 sx={{
+  //                   ":hover": {
+  //                     backgroundColor: "transparent",
+  //                   },
+  //                 }}
+  //                 fw={activeChild === v.id ? "bold" : "normal"}
+  //                 label={<Text>{v.name}</Text>}
+  //                 icon={
+  //                   activeChild === v.id ? (
+  //                     <IconCircleDotFilled size={10} />
+  //                   ) : (
+  //                     <IconCircleDot size={10} />
+  //                   )
+  //                 }
+  //                 onClick={() => {
+  //                   setActiveId(e.id);
+  //                   setActiveChild(v.id);
+  //                   router.push(v.path);
+  //                 }}
+  //               />
+  //             </Box>
+  //           ))}
+  //         </Box>
+  //       )}
+  //     </NavLink>
+  //   </Box>
+  // ));
 
   // async function onLoadNotifikasi() {
   //   const loadNotif = await adminNotifikasi_getByUserId();
   //   setDataNotif(loadNotif as any);
   // }
 
-  useEffect(() => {
-    mqtt_client.subscribe("ADMIN");
+  // useEffect(() => {
+  //   mqtt_client.subscribe("ADMIN");
 
-    mqtt_client.on("message", (topic: any, message: any) => {
-      const data = JSON.parse(message.toString());
-      // console.log(data);
-      setCountNotif(countNotif + data.count);
-    });
-  }, [countNotif]);
+  //   mqtt_client.on("message", (topic: any, message: any) => {
+  //     const data = JSON.parse(message.toString());
+  //     // console.log(data);
+  //     setCountNotif(countNotif + data.count);
+  //   });
+  // }, [countNotif]);
 
   return (
     <>
-      <AppShell
+    <Box>{children}</Box>
+
+
+      {/* 
         padding="md"
         navbarOffsetBreakpoint="md"
         asideOffsetBreakpoint="sm"
@@ -216,7 +190,6 @@ export default function AdminLayout({
             bg={AccentColor.darkblue}
             style={{ color: "white", borderStyle: "none" }}
           >
-            {/* Web View */}
             <MediaQuery smallerThan={"sm"} styles={{ display: "none" }}>
               <Group position="apart" align="center" h={"100%"} px={"md"}>
                 <Title order={3}>Dashboard Admin</Title>
@@ -245,7 +218,6 @@ export default function AdminLayout({
               </Group>
             </MediaQuery>
 
-            {/* Mobile View */}
             <MediaQuery largerThan="sm" styles={{ display: "none" }}>
               <Group h={50} align="center" px={"md"} position="apart">
                 <Burger
@@ -256,7 +228,6 @@ export default function AdminLayout({
                   mr="xl"
                 />
                 <Title order={6}>Dashboard Admin</Title>
-                {/* <Admin_Logout /> */}
                 <ActionIcon>
                   <IconBell />
                 </ActionIcon>
@@ -299,10 +270,10 @@ export default function AdminLayout({
         }
       >
         {children}
-      </AppShell>
+      */}
 
       {/* Drawer Mobile View */}
-      <Drawer opened={opened} onClose={() => setOpened(false)} size={"50%"}>
+      {/* <Drawer opened={opened} onClose={() => setOpened(false)} size={"50%"}>
         <Stack spacing={"xl"}>
           {listAdminPage.map((e) => (
             <Text key={e.id} onClick={() => router.push(e.path)}>
@@ -310,10 +281,10 @@ export default function AdminLayout({
             </Text>
           ))}
         </Stack>
-      </Drawer>
+      </Drawer> */}
 
       {/* Drawer Notifikasi */}
-      <Drawer
+      {/* <Drawer
         title={
           <Group position="apart">
             <Text fw={"bold"} fz={"lg"}>
@@ -326,7 +297,7 @@ export default function AdminLayout({
         position="right"
         size={"xs"}
       >
-        {/* <ComponentAdmin_UIDrawerNotifikasi
+        <ComponentAdmin_UIDrawerNotifikasi
           data={dataNotif}
           onLoadReadNotif={(val: any) => {
             setDataNotif(val);
@@ -339,8 +310,8 @@ export default function AdminLayout({
           onLoadCountNotif={(val: any) => {
             setCountNotif(val);
           }}
-        /> */}
-      </Drawer>
+        />
+      </Drawer> */}
     </>
   );
 }
diff --git a/src/app_modules/check_cookies/layout_cek_cookies.tsx b/src/app_modules/check_cookies/layout_cek_cookies.tsx
index 64a44106..04a8c5f8 100644
--- a/src/app_modules/check_cookies/layout_cek_cookies.tsx
+++ b/src/app_modules/check_cookies/layout_cek_cookies.tsx
@@ -11,9 +11,9 @@ export function CheckCookies_UiLayout({
 }) {
   const router = useRouter();
 
-  // useShallowEffect(() => {
-  //   onCheckCookies();
-  // }, []);
+  useShallowEffect(() => {
+    onCheckCookies();
+  }, []);
 
   async function onCheckCookies() {
     const cek = await fetch("/api/check-cookies");
diff --git a/src/app_modules/check_cookies/ui_check_cookies.tsx b/src/app_modules/check_cookies/ui_check_cookies.tsx
index 9a62aca7..f7a18b31 100644
--- a/src/app_modules/check_cookies/ui_check_cookies.tsx
+++ b/src/app_modules/check_cookies/ui_check_cookies.tsx
@@ -1,23 +1,22 @@
 "use client";
 
-import { Button, Center } from "@mantine/core";
-import { UIGlobal_LayoutTamplate } from "../_global/ui";
 import { RouterAuth } from "@/app/lib/router_hipmi/router_auth";
+import { Button, Center } from "@mantine/core";
 import { useRouter } from "next/navigation";
-import { useShallowEffect } from "@mantine/hooks";
+import { UIGlobal_LayoutDefault } from "../_global/ui";
 
 export function CheckCookies_UiView() {
   const router = useRouter();
 
   return (
     <>
-      <UIGlobal_LayoutTamplate>
+      <UIGlobal_LayoutDefault>
         <Center h={"80vh"}>
           <Button radius={"xl"} onClick={() => router.push(RouterAuth.login)}>
             Kembali ke Halaman Login
           </Button>
         </Center>
-      </UIGlobal_LayoutTamplate>
+      </UIGlobal_LayoutDefault>
     </>
   );
 }
diff --git a/src/app_modules/colab/component/header_tamplate.tsx b/src/app_modules/colab/component/header_tamplate.tsx
deleted file mode 100644
index c24593b9..00000000
--- a/src/app_modules/colab/component/header_tamplate.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-"use client";
-
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-import {
-  Header,
-  Group,
-  ActionIcon,
-  Text,
-  Title,
-  Center,
-  Loader,
-} from "@mantine/core";
-import { IconArrowLeft, IconChevronLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-
-export default function ComponentColab_HeaderTamplate({
-  hideBack,
-  changeIconBack,
-  route,
-  route2,
-  title,
-  icon,
-  bg,
-}: {
-  hideBack?: boolean;
-  changeIconBack?: any;
-  route?: any;
-  route2?: any;
-  title: string;
-  icon?: any;
-  bg?: any;
-}) {
-  const router = useRouter();
-  const [loading, setLoading] = useState(false);
-  // if (loading) return <ComponentGlobal_V2_LoadingPage />;
-
-  return (
-    <>
-      <Header
-        height={50}
-        sx={{ borderStyle: "none" }}
-        bg={bg === null ? "" : bg}
-      >
-        <Group h={50} position="apart" px={"md"}>
-          {hideBack ? (
-            <ActionIcon variant="transparent" disabled></ActionIcon>
-          ) : (
-            <ActionIcon
-              radius={"xl"}
-              loading={loading ? true : false}
-              variant="transparent"
-              onClick={() => {
-                setLoading(true);
-                if (route === null || route === undefined) {
-                  return router.back();
-                } else {
-                  return router.push(route);
-                }
-              }}
-            >
-              {changeIconBack ? changeIconBack : <IconChevronLeft />}
-            </ActionIcon>
-          )}
-          <Title order={5}>{title}</Title>
-          {(() => {
-            if (route2 === null || route2 === undefined) {
-              return <ActionIcon disabled variant="transparent"></ActionIcon>;
-            } else {
-              return (
-                <ActionIcon
-                  variant="transparent"
-                  onClick={() => router.push(route2)}
-                >
-                  {icon}
-                </ActionIcon>
-              );
-            }
-          })()}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/colab/detail/main_detail/layout.tsx b/src/app_modules/colab/detail/main_detail/layout.tsx
index 5e06a14a..ba21b78d 100644
--- a/src/app_modules/colab/detail/main_detail/layout.tsx
+++ b/src/app_modules/colab/detail/main_detail/layout.tsx
@@ -1,12 +1,8 @@
 "use client";
 
-import { RouterColab } from "@/app/lib/router_hipmi/router_colab";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import { IconEdit } from "@tabler/icons-react";
-import React from "react";
-import ComponentColab_HeaderTamplate from "../../component/header_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutColab_MainDetail({
   children,
diff --git a/src/app_modules/colab/detail/proyek/partisipasi/layout.tsx b/src/app_modules/colab/detail/proyek/partisipasi/layout.tsx
index f8834ba0..2a530e7a 100644
--- a/src/app_modules/colab/detail/proyek/partisipasi/layout.tsx
+++ b/src/app_modules/colab/detail/proyek/partisipasi/layout.tsx
@@ -1,9 +1,7 @@
 "use client";
 
-import ComponentColab_HeaderTamplate from "@/app_modules/colab/component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 
 export default function LayoutColab_DetailPartisipasiProyek({
   children,
diff --git a/src/app_modules/colab/detail/proyek/saya/layout.tsx b/src/app_modules/colab/detail/proyek/saya/layout.tsx
index 42b26dee..8c184be5 100644
--- a/src/app_modules/colab/detail/proyek/saya/layout.tsx
+++ b/src/app_modules/colab/detail/proyek/saya/layout.tsx
@@ -1,15 +1,12 @@
 "use client";
 
 import { RouterColab } from "@/app/lib/router_hipmi/router_colab";
-import ComponentColab_HeaderTamplate from "@/app_modules/colab/component/header_tamplate";
-import { MODEL_COLLABORATION } from "@/app_modules/colab/model/interface";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import { ActionIcon, AppShell } from "@mantine/core";
+import UIGlobal_Drawer from "@/app_modules/_global/ui/ui_drawer";
+import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { ActionIcon } from "@mantine/core";
 import { IconDotsVertical, IconEdit } from "@tabler/icons-react";
 import React, { useState } from "react";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
-import UIGlobal_Drawer from "@/app_modules/_global/ui/ui_drawer";
 
 export default function LayoutColab_DetailProyekSaya({
   children,
diff --git a/src/app_modules/colab/edit/layout.tsx b/src/app_modules/colab/edit/layout.tsx
index 13e9c79d..07d45715 100644
--- a/src/app_modules/colab/edit/layout.tsx
+++ b/src/app_modules/colab/edit/layout.tsx
@@ -1,10 +1,8 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import React from "react";
-import ComponentColab_HeaderTamplate from "../component/header_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutColab_Edit({
   children,
diff --git a/src/app_modules/donasi/component/header_tamplate.tsx b/src/app_modules/donasi/component/header_tamplate.tsx
deleted file mode 100644
index 642e8dc2..00000000
--- a/src/app_modules/donasi/component/header_tamplate.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-"use client";
-
-import { Header, Group, ActionIcon, Text, Title } from "@mantine/core";
-import { IconArrowLeft, IconChevronLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-
-export default function ComponentDonasi_HeaderTamplate({
-  hideBack,
-  changeIconBack,
-  route,
-  route2,
-  title,
-  icon,
-  bg,
-}: {
-  hideBack?: boolean;
-  changeIconBack?: any;
-  route?: any;
-  route2?: any;
-  title: string;
-  icon?: any;
-  bg?: any;
-}) {
-  const router = useRouter();
-  const [isLoading, setLoading] = useState(false);
-  const [isRightLoading, setRightLoading] = useState(false);
-
-  return (
-    <>
-      <Header
-        height={50}
-        sx={{ borderStyle: "none" }}
-        bg={bg === null ? "" : bg}
-      >
-        <Group h={50} position="apart" px={"md"}>
-          {hideBack ? (
-            <ActionIcon variant="transparent" disabled></ActionIcon>
-          ) : (
-            <ActionIcon
-              loading={isLoading ? true : false}
-              variant="transparent"
-              onClick={() => {
-                setLoading(true);
-                if (route === null || route === undefined) {
-                  return router.back();
-                } else {
-                  return router.push(route);
-                }
-              }}
-            >
-              {changeIconBack ? changeIconBack : <IconChevronLeft />}
-            </ActionIcon>
-          )}
-          <Title order={5}>{title}</Title>
-          {(() => {
-            if (route2 === null || route2 === undefined) {
-              return <ActionIcon disabled variant="transparent"></ActionIcon>;
-            } else {
-              return (
-                <ActionIcon
-                  loading={isRightLoading ? true : false}
-                  variant="transparent"
-                  onClick={() => {
-                    setRightLoading(true);
-                    router.push(route2);
-                  }}
-                >
-                  {icon}
-                </ActionIcon>
-              );
-            }
-          })()}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/donasi/create/create_kabar/layout.tsx b/src/app_modules/donasi/create/create_kabar/layout.tsx
index 6973e602..e504d834 100644
--- a/src/app_modules/donasi/create/create_kabar/layout.tsx
+++ b/src/app_modules/donasi/create/create_kabar/layout.tsx
@@ -1,10 +1,8 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import React from "react";
-import ComponentDonasi_HeaderTamplate from "../../component/header_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutDonasi_CreateKabar({
   children,
diff --git a/src/app_modules/donasi/detail/detail_donasi_saya/layout.tsx b/src/app_modules/donasi/detail/detail_donasi_saya/layout.tsx
index 64c63a57..304eb7e4 100644
--- a/src/app_modules/donasi/detail/detail_donasi_saya/layout.tsx
+++ b/src/app_modules/donasi/detail/detail_donasi_saya/layout.tsx
@@ -1,11 +1,9 @@
 "use client"
 
 import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi"
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate"
-import React from "react"
-import ComponentDonasi_HeaderTamplate from "../../component/header_tamplate"
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"
+import React from "react"
 
 export default function LayoutDetailDonasiSaya({children}: {children: React.ReactNode}){
     return<>
diff --git a/src/app_modules/donasi/detail/detail_draft/layout.tsx b/src/app_modules/donasi/detail/detail_draft/layout.tsx
index c963e17e..0dc18cab 100644
--- a/src/app_modules/donasi/detail/detail_draft/layout.tsx
+++ b/src/app_modules/donasi/detail/detail_draft/layout.tsx
@@ -1,27 +1,15 @@
 "use client";
 
 import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
 import UIGlobal_Drawer from "@/app_modules/_global/ui/ui_drawer";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { ActionIcon } from "@mantine/core";
 import {
-  ActionIcon,
-  Button,
-  Group,
-  Header,
-  Modal,
-  Stack,
-  Title,
-} from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
-import { IconTornado } from "@tabler/icons-react";
-import {
-  IconChevronLeft,
   IconCreditCard,
   IconDotsVertical,
   IconEdit,
-  IconEditCircle,
+  IconTornado,
 } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
 import React, { useState } from "react";
@@ -87,80 +75,4 @@ export default function LayoutDetailDraftDonasi({
       />
     </>
   );
-
-  // return (
-  //   <>
-  //     <AppComponentGlobal_LayoutTamplate
-  //       header={
-  //         <Header height={50} sx={{ borderStyle: "none" }}>
-  //           <Group h={50} position="apart" px={"md"}>
-  //             <ActionIcon
-  //               variant="transparent"
-  //               onClick={() => {
-  //                 router.back();
-  //               }}
-  //             >
-  //               <IconChevronLeft />
-  //             </ActionIcon>
-  //             <Title order={5}>Detail Draft</Title>
-  //             <ActionIcon variant="transparent" onClick={() => open()}>
-  //               <IconEdit />
-  //             </ActionIcon>
-  //           </Group>
-  //         </Header>
-  //       }
-  //     >
-  //       {children}
-  //     </AppComponentGlobal_LayoutTamplate>
-  //     <Modal opened={opened} onClose={close} centered withCloseButton={false}>
-  //       <Stack>
-  //         <Button
-  //           loaderPosition="center"
-  //           loading={isLoadingDonasi ? true : false}
-  //           style={{ transition: "0.5s" }}
-  //           variant="outline"
-  //           radius={"xl"}
-  //           w={"100%"}
-  //           color="blue"
-  //           onClick={() => {
-  //             setLoadingDonasi(true);
-  //             router.push(RouterDonasi.edit_donasi + `${donasiId}`);
-  //           }}
-  //         >
-  //           Edit Donasi
-  //         </Button>
-  //         <Button
-  //           loaderPosition="center"
-  //           loading={isLoadingCerita ? true : false}
-  //           style={{ transition: "0.5s" }}
-  //           variant="outline"
-  //           radius={"xl"}
-  //           w={"100%"}
-  //           color="teal"
-  //           onClick={() => {
-  //             setLoadingCerita(true);
-  //             router.push(RouterDonasi.edit_cerita_penggalang + `${donasiId}`);
-  //           }}
-  //         >
-  //           Edit Cerita
-  //         </Button>
-  //         <Button
-  //           loaderPosition="center"
-  //           loading={isLoadingRekening ? true : false}
-  //           style={{ transition: "0.5s" }}
-  //           variant="outline"
-  //           radius={"xl"}
-  //           w={"100%"}
-  //           color="orange"
-  //           onClick={() => {
-  //             setLoadingRekening(true);
-  //             router.push(RouterDonasi.edit_rekening + `${donasiId}`);
-  //           }}
-  //         >
-  //           Edit Rekening
-  //         </Button>
-  //       </Stack>
-  //     </Modal>
-  //   </>
-  // );
 }
diff --git a/src/app_modules/donasi/detail/detail_main/cerita_penggalang/layout.tsx b/src/app_modules/donasi/detail/detail_main/cerita_penggalang/layout.tsx
index 5127ad87..e3f6c898 100644
--- a/src/app_modules/donasi/detail/detail_main/cerita_penggalang/layout.tsx
+++ b/src/app_modules/donasi/detail/detail_main/cerita_penggalang/layout.tsx
@@ -1,10 +1,8 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import ButtonDonasi from "@/app_modules/donasi/component/footer_button_donasi";
-import ComponentDonasi_HeaderTamplate from "@/app_modules/donasi/component/header_tamplate";
 import React from "react";
 
 export default function LayoutCeritaPenggalangDonasi({
diff --git a/src/app_modules/donasi/edit/edit_cerita_penggalang/layout.tsx b/src/app_modules/donasi/edit/edit_cerita_penggalang/layout.tsx
index ff29bce1..bee2d3fd 100644
--- a/src/app_modules/donasi/edit/edit_cerita_penggalang/layout.tsx
+++ b/src/app_modules/donasi/edit/edit_cerita_penggalang/layout.tsx
@@ -1,11 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentDonasi_HeaderTamplate from "../../component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutEditCeritaPenggalangDonasi({
   children,
diff --git a/src/app_modules/donasi/edit/edit_rekening/layout.tsx b/src/app_modules/donasi/edit/edit_rekening/layout.tsx
index 03ea5138..c6e99d92 100644
--- a/src/app_modules/donasi/edit/edit_rekening/layout.tsx
+++ b/src/app_modules/donasi/edit/edit_rekening/layout.tsx
@@ -1,11 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentDonasi_HeaderTamplate from "../../component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutDonasi_EditRekening({
   children,
diff --git a/src/app_modules/donasi/main/layout.tsx b/src/app_modules/donasi/main/layout.tsx
index b5097454..f8c9cfb2 100644
--- a/src/app_modules/donasi/main/layout.tsx
+++ b/src/app_modules/donasi/main/layout.tsx
@@ -87,83 +87,4 @@ export default function LayoutDonasi({
       </UIGlobal_LayoutTamplate>
     </>
   );
-
-  // return (
-  //   <>
-  //     <AppComponentGlobal_LayoutTamplate
-  //       header={
-  //         <Header height={50} sx={{ borderStyle: "none" }}>
-  //           <Group h={50} position="apart" px={"md"}>
-  //             <ActionIcon
-  //               radius={"xl"}
-  //               variant="transparent"
-  //               loading={isLoading ? true : false}
-  //               onClick={() => {
-  //                 setLoading(true);
-  //                 router.push(RouterCrowd.main);
-  //               }}
-  //             >
-  //               <IconChevronLeft />
-  //             </ActionIcon>
-  //             <Title order={5}>Donasi</Title>
-  //             <ActionIcon disabled variant="transparent" />
-  //             {/* <ActionIcon
-  //               radius={"md"}
-  //               loading={isRightLoading ? true : false}
-  //               variant="transparent"
-  //               onClick={() => {
-  //                 setRightLoading(true);
-  //                 router.push(RouterDonasi.notif_page + `${userId}`);
-  //               }}
-  //             >
-  //               {_.isEmpty(isRead) ? (
-  //                 <IconBell />
-  //               ) : isRead.includes(false) ? (
-  //                 <Indicator processing color="orange">
-  //                   <IconBell />
-  //                 </Indicator>
-  //               ) : (
-  //                 <IconBell />
-  //               )}
-  //             </ActionIcon> */}
-  //           </Group>
-  //         </Header>
-  //       }
-  //       footer={
-  //         <Footer height={"10vh"} bg={"dark"}>
-  //           <Grid align="center" h={"10vh"} pt={"xs"} grow>
-  //             {/* Tampilan Bursa */}
-  //             {listPage.map((e, i) => (
-  //               <Grid.Col
-  //                 key={e.id}
-  //                 span={3}
-  //                 onClick={() => {
-  //                   router.push(e.path);
-  //                   setActive(i);
-  //                 }}
-  //               >
-  //                 <Center>
-  //                   <Flex direction={"column"} align={"center"} w={"100%"}>
-  //                     <ActionIcon
-  //                       variant="transparent"
-  //                       c={active === i ? "orange" : "white"}
-  //                     >
-  //                       {e.icon}
-  //                     </ActionIcon>
-  //                     <Text c={active === i ? "orange" : "white"} fz={"xs"}>
-  //                       {e.name}
-  //                     </Text>
-  //                   </Flex>
-  //                 </Center>
-  //               </Grid.Col>
-  //             ))}
-  //           </Grid>
-  //         </Footer>
-  //       }
-  //     >
-  //       {/* {JSON.stringify(isRead)} */}
-  //       {children}
-  //     </AppComponentGlobal_LayoutTamplate>
-  //   </>
-  // );
 }
diff --git a/src/app_modules/donasi/proses_donasi/invoice/layout.tsx b/src/app_modules/donasi/proses_donasi/invoice/layout.tsx
index 25319bc8..b8080cde 100644
--- a/src/app_modules/donasi/proses_donasi/invoice/layout.tsx
+++ b/src/app_modules/donasi/proses_donasi/invoice/layout.tsx
@@ -1,18 +1,15 @@
 "use client";
 
-import { ActionIcon, AppShell, Group, Header, Title } from "@mantine/core";
-import React from "react";
-import ComponentDonasi_HeaderTamplate from "../../component/header_tamplate";
-import { IconChevronLeft, IconX } from "@tabler/icons-react";
 import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
-import { gs_donasi_hot_menu } from "../../global_state";
+import { ActionIcon } from "@mantine/core";
+import { IconX } from "@tabler/icons-react";
 import { useAtom } from "jotai";
+import React from "react";
+import { gs_donasi_hot_menu } from "../../global_state";
 
-import { title } from "process";
-import { useRouter } from "next/navigation";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { useRouter } from "next/navigation";
 
 export default function LayoutDonasi_InvoiceProses({
   children,
diff --git a/src/app_modules/donasi/proses_donasi/proses_transaksi/layout.tsx b/src/app_modules/donasi/proses_donasi/proses_transaksi/layout.tsx
index d64a9331..10b3f2c0 100644
--- a/src/app_modules/donasi/proses_donasi/proses_transaksi/layout.tsx
+++ b/src/app_modules/donasi/proses_donasi/proses_transaksi/layout.tsx
@@ -1,17 +1,15 @@
 "use client";
 
-import { ActionIcon, AppShell, Group, Header, Title } from "@mantine/core";
-import React, { useState } from "react";
-import ComponentDonasi_HeaderTamplate from "../../component/header_tamplate";
-import { IconX } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
 import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
-import { useAtom } from "jotai";
-import { gs_donasi_hot_menu } from "../../global_state";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import ComponentGlobal_Loader from "@/app_modules/_global/component/loader";
+import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { ActionIcon } from "@mantine/core";
+import { IconX } from "@tabler/icons-react";
+import { useAtom } from "jotai";
+import { useRouter } from "next/navigation";
+import React, { useState } from "react";
+import { gs_donasi_hot_menu } from "../../global_state";
 
 export default function LayoutDonasi_ProsesTransaksi({
   children,
diff --git a/src/app_modules/event/component/header_tamplate.tsx b/src/app_modules/event/component/header_tamplate.tsx
deleted file mode 100644
index f1f0c1e0..00000000
--- a/src/app_modules/event/component/header_tamplate.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-"use client";
-
-import { Header, Group, ActionIcon, Text, Title } from "@mantine/core";
-import { IconArrowLeft, IconChevronLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-
-export default function ComponentEvent_HeaderTamplate({
-  hideBack,
-  changeIconBack,
-  route,
-  route2,
-  title,
-  icon,
-  bg,
-}: {
-  hideBack?: boolean;
-  changeIconBack?: any;
-  route?: any;
-  route2?: any;
-  title: string;
-  icon?: any;
-  bg?: any;
-}) {
-  const router = useRouter();
-  const [isLoadingBack, setLoadingBack] = useState(false);
-  const [isLoadingOtherIcon, setLoadingOtherIcon] = useState(false);
-  return (
-    <>
-      <Header
-        height={50}
-        sx={{ borderStyle: "none" }}
-        bg={bg === null ? "" : bg}
-      >
-        <Group h={50} position="apart" px={"md"}>
-          {hideBack ? (
-            <ActionIcon variant="transparent" disabled></ActionIcon>
-          ) : (
-            <ActionIcon
-              loading={isLoadingBack ? true : false}
-              variant="transparent"
-              onClick={() => {
-                setLoadingBack(true);
-                if (route === null || route === undefined) {
-                  return router.back();
-                } else {
-                  return router.push(route);
-                }
-              }}
-            >
-              {changeIconBack ? changeIconBack : <IconChevronLeft />}
-            </ActionIcon>
-          )}
-          <Title order={5}>{title}</Title>
-          {(() => {
-            if (route2 === null || route2 === undefined) {
-              return <ActionIcon disabled variant="transparent"></ActionIcon>;
-            } else {
-              return (
-                <ActionIcon
-                  loading={isLoadingOtherIcon ? true : false}
-                  variant="transparent"
-                  onClick={() => {
-                    setLoadingOtherIcon(true);
-                    router.push(route2);
-                  }}
-                >
-                  {icon}
-                </ActionIcon>
-              );
-            }
-          })()}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/event/create/layout.tsx b/src/app_modules/event/create/layout.tsx
index a9d4dc61..00e6048b 100644
--- a/src/app_modules/event/create/layout.tsx
+++ b/src/app_modules/event/create/layout.tsx
@@ -1,11 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentEvent_HeaderTamplate from "../component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutEvent_Create({
   children,
diff --git a/src/app_modules/event/detail/publish/layout.tsx b/src/app_modules/event/detail/publish/layout.tsx
index a0f701fb..35c78baa 100644
--- a/src/app_modules/event/detail/publish/layout.tsx
+++ b/src/app_modules/event/detail/publish/layout.tsx
@@ -1,11 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentEvent_HeaderTamplate from "../../component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutEvent_DetailPublish({
   children,
diff --git a/src/app_modules/event/detail/review/layout.tsx b/src/app_modules/event/detail/review/layout.tsx
index 0078196b..28480947 100644
--- a/src/app_modules/event/detail/review/layout.tsx
+++ b/src/app_modules/event/detail/review/layout.tsx
@@ -1,11 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentEvent_HeaderTamplate from "../../component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutEvent_DetailReview({
   children,
diff --git a/src/app_modules/event/edit/layout.tsx b/src/app_modules/event/edit/layout.tsx
index 496df96b..fbe4d4f7 100644
--- a/src/app_modules/event/edit/layout.tsx
+++ b/src/app_modules/event/edit/layout.tsx
@@ -1,11 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentEvent_HeaderTamplate from "../component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutEvent_Edit({
   children,
diff --git a/src/app_modules/forum/component/header/header_rata_kiri.tsx b/src/app_modules/forum/component/header/header_rata_kiri.tsx
deleted file mode 100644
index d99b6f8e..00000000
--- a/src/app_modules/forum/component/header/header_rata_kiri.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-"use client";
-
-import { ActionIcon, Group, Header, Title } from "@mantine/core";
-import { IconX } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-
-export default function ComponentForum_HeaderRataKiri({
-  title,
-}: {
-  title: string;
-}) {
-  const router = useRouter();
-  return (
-    <>
-      <Header height={50} sx={{ borderStyle: "none" }}>
-        <Group h={50} px={"md"}>
-          <ActionIcon
-            variant="transparent"
-            onClick={() => {
-              router.back();
-            }}
-          >
-            <IconX />
-          </ActionIcon>
-          <Title order={5}>{title}</Title>
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/forum/component/header/header_tamplate.tsx b/src/app_modules/forum/component/header/header_tamplate.tsx
deleted file mode 100644
index 236b8b67..00000000
--- a/src/app_modules/forum/component/header/header_tamplate.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-"use client";
-
-import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-import {
-  Header,
-  Group,
-  ActionIcon,
-  Text,
-  Title,
-  Center,
-  Loader,
-} from "@mantine/core";
-import { IconArrowLeft, IconChevronLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-
-export default function ComponentForum_HeaderTamplate({
-  hideBack,
-  changeIconBack,
-  route,
-  route2,
-  title,
-  icon,
-  bg,
-}: {
-  hideBack?: boolean;
-  changeIconBack?: any;
-  route?: any;
-  route2?: any;
-  title: string;
-  icon?: any;
-  bg?: any;
-}) {
-  const router = useRouter();
-  const [isLoading, setLoading] = useState(false);
-
-  return (
-    <>
-      <Header
-        height={50}
-        sx={{ borderStyle: "none" }}
-        bg={bg === null ? "" : bg}
-      >
-        <Group h={50} position="apart" px={"md"}>
-          {hideBack ? (
-            <ActionIcon variant="transparent" disabled></ActionIcon>
-          ) : (
-            <ActionIcon
-              loading={isLoading ? true : false}
-              variant="transparent"
-              onClick={() => {
-                setLoading(true);
-                if (route === null || route === undefined) {
-                  return router.back();
-                } else {
-                  return router.push(route);
-                }
-              }}
-            >
-              {changeIconBack ? changeIconBack : <IconChevronLeft />}
-            </ActionIcon>
-          )}
-          <Title order={5}>{title}</Title>
-          {(() => {
-            if (route2 === null || route2 === undefined) {
-              return <ActionIcon disabled variant="transparent"></ActionIcon>;
-            } else {
-              return (
-                <ActionIcon
-                  variant="transparent"
-                  onClick={() => router.push(route2)}
-                >
-                  {icon}
-                </ActionIcon>
-              );
-            }
-          })()}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/forum/create/layout.tsx b/src/app_modules/forum/create/layout.tsx
index 5b6a74e1..220672bd 100644
--- a/src/app_modules/forum/create/layout.tsx
+++ b/src/app_modules/forum/create/layout.tsx
@@ -1,11 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentForum_HeaderTamplate from "../component/header/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutForum_Create({
   children,
diff --git a/src/app_modules/forum/detail/layout.tsx b/src/app_modules/forum/detail/layout.tsx
index 4464dc21..f563082f 100644
--- a/src/app_modules/forum/detail/layout.tsx
+++ b/src/app_modules/forum/detail/layout.tsx
@@ -1,15 +1,10 @@
 "use client";
 
-import { ActionIcon, AppShell, Group, Header, Title } from "@mantine/core";
-import React, { useState } from "react";
-import ComponentForum_HeaderTamplate from "../component/header/header_tamplate";
-import { useRouter } from "next/navigation";
-import { IconChevronLeft } from "@tabler/icons-react";
 import ComponentGlobal_V2_LoadingPage from "@/app_modules/_global/loading_page_v2";
-import { revalidatePath } from "next/cache";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { useRouter } from "next/navigation";
+import React, { useState } from "react";
 
 export const dynamic = "force-dynamic";
 export default function LayoutForum_Detail({
@@ -25,32 +20,12 @@ export default function LayoutForum_Detail({
   return (
     <>
       <UIGlobal_LayoutTamplate
-        header={<UIGlobal_LayoutHeaderTamplate title="Postingan" posotion={"left"} />}
-      >
-        {children}
-      </UIGlobal_LayoutTamplate>
-
-      {/* <AppComponentGlobal_LayoutTamplate
         header={
-          <Header height={50} sx={{ borderStyle: "none" }}>
-            <Group h={50} px={"md"}>
-              <ActionIcon
-                loading={loading ? true : false}
-                variant="transparent"
-                onClick={() => {
-                  setLoading(true);
-                  router.back();
-                }}
-              >
-                <IconChevronLeft />
-              </ActionIcon>
-              <Title order={5}>Postingan</Title>
-            </Group>
-          </Header>
+          <UIGlobal_LayoutHeaderTamplate title="Postingan" posotion={"left"} />
         }
       >
         {children}
-      </AppComponentGlobal_LayoutTamplate> */}
+      </UIGlobal_LayoutTamplate>
     </>
   );
 }
diff --git a/src/app_modules/forum/edit/komentar/layout.tsx b/src/app_modules/forum/edit/komentar/layout.tsx
index bfbd361d..4e3171dd 100644
--- a/src/app_modules/forum/edit/komentar/layout.tsx
+++ b/src/app_modules/forum/edit/komentar/layout.tsx
@@ -1,9 +1,10 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
+import {
+  UIGlobal_LayoutHeaderTamplate,
+  UIGlobal_LayoutTamplate,
+} from "@/app_modules/_global/ui";
 import React from "react";
-import ComponentForum_HeaderTamplate from "../../component/header/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
 
 export default function LayoutForum_EditKomentar({
   children,
@@ -12,11 +13,11 @@ export default function LayoutForum_EditKomentar({
 }) {
   return (
     <>
-      <AppComponentGlobal_LayoutTamplate
-        header={<ComponentForum_HeaderTamplate title="Edit Komentar" />}
+      <UIGlobal_LayoutTamplate
+        header={<UIGlobal_LayoutHeaderTamplate title="Edit Komentar" />}
       >
         {children}
-      </AppComponentGlobal_LayoutTamplate>
+      </UIGlobal_LayoutTamplate>
     </>
   );
 }
diff --git a/src/app_modules/forum/edit/posting/layout.tsx b/src/app_modules/forum/edit/posting/layout.tsx
index d184fc8f..7ba11308 100644
--- a/src/app_modules/forum/edit/posting/layout.tsx
+++ b/src/app_modules/forum/edit/posting/layout.tsx
@@ -1,11 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentForum_HeaderTamplate from "../../component/header/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutForum_EditPosting({
   children,
diff --git a/src/app_modules/forum/report/komentar/layout.tsx b/src/app_modules/forum/report/komentar/layout.tsx
index d2a445e6..6e47e284 100644
--- a/src/app_modules/forum/report/komentar/layout.tsx
+++ b/src/app_modules/forum/report/komentar/layout.tsx
@@ -1,10 +1,8 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import React from "react";
-import ComponentForum_HeaderRataKiri from "../../component/header/header_rata_kiri";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import React from "react";
 
 export default function LayoutForum_ReportKomentar({
   children,
diff --git a/src/app_modules/home/view_home.tsx b/src/app_modules/home/view_home.tsx
index 0bb0852d..b291c2ff 100644
--- a/src/app_modules/home/view_home.tsx
+++ b/src/app_modules/home/view_home.tsx
@@ -14,6 +14,7 @@ import { useShallowEffect } from "@mantine/hooks";
 import { gs_count_ntf, gs_user_ntf } from "@/app/lib/global_state";
 import { useAtom } from "jotai";
 import notifikasi_countUserNotifikasi from "../notifikasi/fun/count/fun_count_by_id";
+import { Center, Text, Title } from "@mantine/core";
 
 export default function HomeView({
   dataUser,
@@ -52,6 +53,9 @@ export default function HomeView({
     <>
       <UIGlobal_LayoutTamplate
         header={
+          // <Center>
+          //   <Title order={3}>HIPMI</Title>
+          // </Center>
           <UIGlobal_LayoutHeaderTamplate
             title="HIPMI"
             customButtonLeft={
diff --git a/src/app_modules/investasi/detail/layout.tsx b/src/app_modules/investasi/detail/layout.tsx
index 0386eba7..78764d3f 100644
--- a/src/app_modules/investasi/detail/layout.tsx
+++ b/src/app_modules/investasi/detail/layout.tsx
@@ -1,10 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { ActionIcon, Group, Header, Title } from "@mantine/core";
-import { IconChevronLeft } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
 import React from "react";
 
@@ -17,31 +14,7 @@ export default function LayoutDetailInvestasi({
   return (
     <>
       <UIGlobal_LayoutTamplate
-        header={
-          <UIGlobal_LayoutHeaderTamplate title="Detail" />
-          // <Header height={50} style={{ borderStyle: "none" }}>
-          //   <Group h={50} position="apart" px={"md"}>
-          //     <ActionIcon
-          //       variant="transparent"
-          //       onClick={() => {
-          //         router.back();
-          //       }}
-          //     >
-          //       <IconChevronLeft />
-          //     </ActionIcon>
-          //     <Title order={5}>Detail Investasi</Title>
-          //     <ActionIcon
-          //       variant="transparent"
-          //       disabled
-          //       onClick={() => {
-          //         router.replace("");
-          //       }}
-          //     >
-          //       {/* <IconEdit /> */}
-          //     </ActionIcon>
-          //   </Group>
-          // </Header>
-        }
+        header={<UIGlobal_LayoutHeaderTamplate title="Detail" />}
       >
         {children}
       </UIGlobal_LayoutTamplate>
diff --git a/src/app_modules/investasi/detail_berita/layout.tsx b/src/app_modules/investasi/detail_berita/layout.tsx
index 8248f91a..a6c2010c 100644
--- a/src/app_modules/investasi/detail_berita/layout.tsx
+++ b/src/app_modules/investasi/detail_berita/layout.tsx
@@ -1,10 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { AppShell } from "@mantine/core";
 import React from "react";
 
 export default function LayoutDetailBeritaInvestasi({
diff --git a/src/app_modules/investasi/detail_dokumen/layout.tsx b/src/app_modules/investasi/detail_dokumen/layout.tsx
index 26be196c..91cc6aa7 100644
--- a/src/app_modules/investasi/detail_dokumen/layout.tsx
+++ b/src/app_modules/investasi/detail_dokumen/layout.tsx
@@ -1,10 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { AppShell } from "@mantine/core";
 import React from "react";
 
 export default function LayoutDetailDokumenInvestasi({
diff --git a/src/app_modules/investasi/detail_portofolio/draft/layout.tsx b/src/app_modules/investasi/detail_portofolio/draft/layout.tsx
index 450d32a2..3e7b53b3 100644
--- a/src/app_modules/investasi/detail_portofolio/draft/layout.tsx
+++ b/src/app_modules/investasi/detail_portofolio/draft/layout.tsx
@@ -1,12 +1,10 @@
 "use client";
 
 import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_Drawer from "@/app_modules/_global/ui/ui_drawer";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { ActionIcon, AppShell } from "@mantine/core";
+import { ActionIcon } from "@mantine/core";
 import { IconDotsVertical, IconEdit, IconFilePencil } from "@tabler/icons-react";
 import React, { useState } from "react";
 
diff --git a/src/app_modules/investasi/detail_portofolio/publish/layout.tsx b/src/app_modules/investasi/detail_portofolio/publish/layout.tsx
index e9c8342a..f63c2c85 100644
--- a/src/app_modules/investasi/detail_portofolio/publish/layout.tsx
+++ b/src/app_modules/investasi/detail_portofolio/publish/layout.tsx
@@ -1,10 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { AppShell } from "@mantine/core";
 import React from "react";
 
 export default function LayoutDetailPublishInvestasi({
diff --git a/src/app_modules/investasi/detail_portofolio/reject/layout.tsx b/src/app_modules/investasi/detail_portofolio/reject/layout.tsx
index a6551759..43c46aaa 100644
--- a/src/app_modules/investasi/detail_portofolio/reject/layout.tsx
+++ b/src/app_modules/investasi/detail_portofolio/reject/layout.tsx
@@ -1,11 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { AppShell } from "@mantine/core";
-import { IconEdit } from "@tabler/icons-react";
 import React from "react";
 
 export default function LayoutDetailRejecttInvestasi({
diff --git a/src/app_modules/investasi/detail_portofolio/review/layout.tsx b/src/app_modules/investasi/detail_portofolio/review/layout.tsx
index c3ac2ef9..924ba21f 100644
--- a/src/app_modules/investasi/detail_portofolio/review/layout.tsx
+++ b/src/app_modules/investasi/detail_portofolio/review/layout.tsx
@@ -1,10 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { AppShell } from "@mantine/core";
 import React from "react";
 
 export default function LayoutDetailReviewInvestasi({
diff --git a/src/app_modules/investasi/dialog_page/create/layout.tsx b/src/app_modules/investasi/dialog_page/create/layout.tsx
index 45b91b88..9bd1fb8c 100644
--- a/src/app_modules/investasi/dialog_page/create/layout.tsx
+++ b/src/app_modules/investasi/dialog_page/create/layout.tsx
@@ -3,17 +3,13 @@
 import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
 import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
 import {
-  AppShell,
-  CloseButton,
   Footer,
   Group,
-  Header,
-  Text,
+  Text
 } from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
 import { IconAlertTriangle } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
-import router from "next/router";
 import React from "react";
 
 export default function LayoutDialogPageCreateInvestasi({
diff --git a/src/app_modules/investasi/dialog_page/transaksi_saham/layout.tsx b/src/app_modules/investasi/dialog_page/transaksi_saham/layout.tsx
deleted file mode 100644
index ae0c92aa..00000000
--- a/src/app_modules/investasi/dialog_page/transaksi_saham/layout.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-"use client";
-
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import { AppShell, CloseButton, Group, Header, Text } from "@mantine/core";
-import { useAtom } from "jotai";
-import { useRouter } from "next/navigation";
-import React from "react";
-import { gs_investas_menu } from "../../g_state";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-
-export default function LayoutCountDownTransaksiInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const router = useRouter();
-  const [hotMenu, setHotMenu] = useAtom(gs_investas_menu);
-  return (
-    <>
-      <AppComponentGlobal_LayoutTamplate
-        header={
-          <Header height={50} sx={{ borderStyle: "none" }} px={"md"}>
-            <Group h={50} align="center">
-              <CloseButton
-                size={"md"}
-                onClick={() => {
-                  router.push(RouterInvestasi_OLD.main_transaksi), setHotMenu(3);
-                }}
-              />
-              <Text>Status Transfer</Text>
-            </Group>
-          </Header>
-        }
-      >
-        {children}
-      </AppComponentGlobal_LayoutTamplate>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/dialog_page/transaksi_saham/view.tsx b/src/app_modules/investasi/dialog_page/transaksi_saham/view.tsx
deleted file mode 100644
index 7d63e777..00000000
--- a/src/app_modules/investasi/dialog_page/transaksi_saham/view.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-"use client";
-
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import { Box, Center, Loader, Stack, Text, Title } from "@mantine/core";
-import { useShallowEffect } from "@mantine/hooks";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-import Countdown from "react-countdown";
-
-export default function CountDownTransaksiInvestasi() {
-  const router = useRouter();
-  const [count, setCount] = useState<any | null>(10);
-  useShallowEffect(() => {
-    setTimeout(() => router.push(RouterInvestasi_OLD.status_transaksi), 10000);
-  }, []);
-
-  const PopupCD = () => <Text>Sedang di Proses</Text>;
-  const countD = ({ hours, minutes, seconds, completed }: any) => {
-    if (completed) {
-      return PopupCD();
-    } else {
-      return (
-        <>
-          {minutes}:{seconds}
-        </>
-      );
-    }
-  };
-
-  return (
-    <>
-      <Center h={"80vh"}>
-        <Stack>
-          <Box>
-            <Center>
-              <Stack spacing={"sm"}>
-                <Text>Xendit sedang memproses transaksimu</Text>
-                <Center>
-                  <Title order={5}>
-                    <Countdown date={Date.now() + 600000} renderer={countD} />
-                  </Title>
-                </Center>
-                <Center>
-                  <Loader size={"xl"} variant="bars" />
-                </Center>
-              </Stack>
-            </Center>
-          </Box>
-        </Stack>
-      </Center>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/edit_berita/layout.tsx b/src/app_modules/investasi/edit_berita/layout.tsx
index ee496706..48dbea44 100644
--- a/src/app_modules/investasi/edit_berita/layout.tsx
+++ b/src/app_modules/investasi/edit_berita/layout.tsx
@@ -1,8 +1,9 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { useRouter } from "next/navigation";
+import {
+  UIGlobal_LayoutHeaderTamplate,
+  UIGlobal_LayoutTamplate,
+} from "@/app_modules/_global/ui";
 import React from "react";
 
 export default function LayoutEditBeritaInvestasi({
@@ -10,14 +11,13 @@ export default function LayoutEditBeritaInvestasi({
 }: {
   children: React.ReactNode;
 }) {
-  const router = useRouter();
   return (
     <>
-      <AppComponentGlobal_LayoutTamplate
-        header={<ComponentGlobal_HeaderTamplate title="Edit Berita" />}
+      <UIGlobal_LayoutTamplate
+        header={<UIGlobal_LayoutHeaderTamplate title="Edit Berita" />}
       >
         {children}
-      </AppComponentGlobal_LayoutTamplate>
+      </UIGlobal_LayoutTamplate>
     </>
   );
 }
diff --git a/src/app_modules/investasi/index.ts b/src/app_modules/investasi/index.ts
index 12aa9453..1f35fe6e 100644
--- a/src/app_modules/investasi/index.ts
+++ b/src/app_modules/investasi/index.ts
@@ -1,15 +1,7 @@
 import InvestasiCreate from "./create/view";
 import InvestasiCreateLayout from "./create/layout";
-import UploadGambarInvestasi from "./upload/view";
-import LayoutUploadGambarInvestasi from "./upload/layout";
 import DetailInvestasi from "./detail/view";
 import LayoutDetailInvestasi from "./detail/layout";
-import ProsesInvestasi from "./proses_investasi/view";
-import LayoutProsesInvestasi from "./proses_investasi/layout";
-import UploadBuktiTransferInvestasi from "./upload_bukti/view";
-import LayoutBuktiTransferInvestasi from "./upload_bukti/layout";
-import CountDownTransaksiInvestasi from "./dialog_page/transaksi_saham/view";
-import LayoutCountDownTransaksiInvestasi from "./dialog_page/transaksi_saham/layout";
 import PortofolioInvestasi from "./portofolio/view";
 import LayoutPortofolioInvestasi from "./portofolio/layout";
 import EditIntroInvestasi from "./edit_intro/view";
@@ -28,12 +20,7 @@ import DetailBeritaInvestasi from "./detail_berita/view";
 import LayoutDetailBeritaInvestasi from "./detail_berita/layout";
 import BeritaInvestasi from "./berita/view";
 import LayoutBeritaInvestasi from "./berita/layout";
-import MetodeTransferInvestasi from "./metode_transfer/view";
-import LayoutMetodeTransferInvestasi from "./metode_transfer/layout";
-import TransferInvestasi from "./transfer/view";
-import LayoutTransferInvestasi from "./transfer/layout";
 import StatusTransaksiInvestasi from "./status_transaksi/view";
-import LayoutStatusTransaksiInvestasi from "./status_transaksi/layout";
 import DialogPageCreateInvestasi from "./dialog_page/create/view";
 import LayoutDialogPageCreateInvestasi from "./dialog_page/create/layout";
 import CreateBeritaInvestasi from "./create_berita/view";
@@ -52,7 +39,6 @@ import LayoutDetailRejectInvestasi from "./detail_portofolio/reject/layout";
 import TransaksiInvestasi from "./transaksi/view";
 import LayoutTransaksiInvestasi from "./transaksi/layout";
 import StatusTransaksiInvestasi_Gagal from "./status_transaksi/gagal/view";
-import LayoutStatusTransaksiInvestasi_Gagal from "./status_transaksi/gagal/layout";
 import UploadProspektusInvestasi from "./upload_prospektus/view";
 import LayoutUploadProspektusInvestasi from "./upload_prospektus/layout";
 import UploadDokumenInvestasi from "./upload_dokumen/view";
@@ -65,16 +51,8 @@ import LayoutStatusPesananInvestasi from "./status_pesanan/layout";
 export {
   InvestasiCreate,
   InvestasiCreateLayout,
-  UploadGambarInvestasi,
-  LayoutUploadGambarInvestasi,
   DetailInvestasi,
   LayoutDetailInvestasi,
-  ProsesInvestasi,
-  LayoutProsesInvestasi,
-  UploadBuktiTransferInvestasi,
-  LayoutBuktiTransferInvestasi,
-  CountDownTransaksiInvestasi as KonfirmasiBuktiInvestasi,
-  LayoutCountDownTransaksiInvestasi as LayoutKonfirmasiBuktiInvestasi,
   PortofolioInvestasi,
   LayoutPortofolioInvestasi,
   EditIntroInvestasi,
@@ -93,12 +71,7 @@ export {
   LayoutDetailBeritaInvestasi,
   BeritaInvestasi,
   LayoutBeritaInvestasi as LayoutBeritaInvestasi,
-  MetodeTransferInvestasi,
-  LayoutMetodeTransferInvestasi,
-  TransferInvestasi,
-  LayoutTransferInvestasi,
   StatusTransaksiInvestasi,
-  LayoutStatusTransaksiInvestasi,
   DialogPageCreateInvestasi,
   LayoutDialogPageCreateInvestasi,
   CreateBeritaInvestasi,
@@ -117,7 +90,6 @@ export {
   TransaksiInvestasi,
   LayoutTransaksiInvestasi,
   StatusTransaksiInvestasi_Gagal,
-  LayoutStatusTransaksiInvestasi_Gagal,
   UploadProspektusInvestasi,
   LayoutUploadProspektusInvestasi,
   UploadDokumenInvestasi,
diff --git a/src/app_modules/investasi/list_edit_berita/layout.tsx b/src/app_modules/investasi/list_edit_berita/layout.tsx
index 56143c5d..2ad871f5 100644
--- a/src/app_modules/investasi/list_edit_berita/layout.tsx
+++ b/src/app_modules/investasi/list_edit_berita/layout.tsx
@@ -1,16 +1,13 @@
 "use client";
 
 import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { ActionIcon, AppShell } from "@mantine/core";
-import { IconDotsVertical, IconPencilPlus } from "@tabler/icons-react";
-import React from "react";
-import getOneInvestasiById from "../fun/get_one_investasi_by_id";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
-import { useRouter } from "next/navigation";
 import UIGlobal_Drawer from "@/app_modules/_global/ui/ui_drawer";
+import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { ActionIcon } from "@mantine/core";
+import { IconDotsVertical, IconPencilPlus } from "@tabler/icons-react";
+import { useRouter } from "next/navigation";
+import React from "react";
 
 export default function LayoutListEditBeritaInvestasi({
   children,
diff --git a/src/app_modules/investasi/metode_transfer/layout.tsx b/src/app_modules/investasi/metode_transfer/layout.tsx
deleted file mode 100644
index d33ebaab..00000000
--- a/src/app_modules/investasi/metode_transfer/layout.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-"use client";
-
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell } from "@mantine/core";
-import React from "react";
-
-export default function LayoutMetodeTransferInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <AppComponentGlobal_LayoutTamplate
-        header={
-          <ComponentGlobal_HeaderTamplate title="Pilih Metode Transfer" />
-        }
-      >
-        {children}
-      </AppComponentGlobal_LayoutTamplate>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/metode_transfer/view.tsx b/src/app_modules/investasi/metode_transfer/view.tsx
deleted file mode 100644
index 131f5a8a..00000000
--- a/src/app_modules/investasi/metode_transfer/view.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-"use client";
-
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import { Warna } from "@/app/lib/warna";
-import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
-import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal";
-import {
-  Box,
-  Button,
-  Center,
-  Flex,
-  Paper,
-  Radio,
-  Text,
-  Title,
-} from "@mantine/core";
-import { useAtom } from "jotai";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-import { MODEL_INVESTASI, MODEL_MASTER_BANK } from "../_lib/interface";
-import funCreateTransaksiInvestasi from "../fun/fun_create_transaksi";
-import getNorekInvestasi from "../fun/get_norek";
-import { gs_TransferValue } from "../g_state";
-
-export default function MetodeTransferInvestasi({
-  dataInvestasi,
-  namaBank,
-  authorId,
-}: {
-  dataInvestasi: MODEL_INVESTASI;
-  namaBank: MODEL_MASTER_BANK[];
-  authorId: string;
-}) {
-  const [investasi, setInvestasi] = useState(dataInvestasi);
-  const [bank, setBank] = useState(namaBank);
-  const [pilihBank, setPilihBank] = useState<string | null>(null);
-  const router = useRouter();
-  const [transferValue, setTransferValue] = useAtom(gs_TransferValue);
-
-  async function onSubmit() {
-    // Create Transaksi
-    await funCreateTransaksiInvestasi(
-      transferValue as any,
-      investasi.id,
-      authorId
-    ).then(async (res) => {
-      if (res.status === 201) {
-        ComponentGlobal_NotifikasiBerhasil(res.message);
-        router.push(RouterInvestasi_OLD.transfer + `${res.res?.id}`);
-      } else {
-        ComponentGlobal_NotifikasiGagal(res.message);
-      }
-    });
-  }
-
-  async function onSelect(id: string) {
-    await getNorekInvestasi(id).then((res) => {
-      if (res.status === 200) {
-        setTransferValue({
-          ...transferValue,
-          namaBank: res.res?.namaBank as any,
-          nomorRekening: res.res?.norek as any,
-        });
-      } else {
-        ComponentGlobal_NotifikasiGagal(res.message);
-      }
-    });
-  }
-
-  return (
-    <>
-      {/* <pre>{JSON.stringify(transferValue, null, 2)}</pre> */}
-      {/* Box judul */}
-      <Paper bg={"gray"} p={"xs"} shadow="lg" mb={"md"}>
-        <Title order={5}>{investasi.title}</Title>
-        <Text fz={"sm"}>Total Transfer : Rp.{transferValue.totalTransfer}</Text>
-      </Paper>
-
-      {/* Metode transfer */}
-      <Radio.Group
-        name="Metode Trf"
-        label="Metode Transfer"
-        description="Pilih salah satu bank"
-        withAsterisk
-        my={"md"}
-        onChange={(val) => {
-          setPilihBank(val);
-          onSelect(val);
-        }}
-        value={"" + pilihBank}
-      >
-        <Flex direction={"column"} gap={"lg"} mt="xs">
-          {bank.map((e) => (
-            <Box key={e.id}>
-              <Radio value={e.id} label={e.namaBank} />
-            </Box>
-          ))}
-        </Flex>
-      </Radio.Group>
-
-      <Center>
-        {pilihBank === null ? (
-          <Button my={"md"} w={300} disabled radius={50}>
-            Pilih Bank
-          </Button>
-        ) : (
-          <Button
-            my={"md"}
-            w={300}
-            bg={Warna.biru}
-            radius={50}
-            onClick={() => {
-              onSubmit();
-            }}
-          >
-            Lanjutkan Untuk Transfer
-          </Button>
-        )}
-      </Center>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/portofolio/layout.tsx b/src/app_modules/investasi/portofolio/layout.tsx
index a87ccabf..496a0095 100644
--- a/src/app_modules/investasi/portofolio/layout.tsx
+++ b/src/app_modules/investasi/portofolio/layout.tsx
@@ -1,14 +1,6 @@
 "use client";
 
 import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import {
-  AppShell,
-  Box,
-  Button,
-  Group,
-  Header,
-  ScrollArea,
-} from "@mantine/core";
 import React, { useState } from "react";
 
 export default function LayoutPortofolioInvestasi({
diff --git a/src/app_modules/investasi/proses_investasi/layout.tsx b/src/app_modules/investasi/proses_investasi/layout.tsx
deleted file mode 100644
index 20e7abed..00000000
--- a/src/app_modules/investasi/proses_investasi/layout.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-"use client";
-
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell } from "@mantine/core";
-import React from "react";
-
-export default function LayoutProsesInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <AppComponentGlobal_LayoutTamplate
-        header={<ComponentGlobal_HeaderTamplate title="Proses Investasi" />}
-      >
-        {children}
-      </AppComponentGlobal_LayoutTamplate>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/proses_investasi/view.tsx b/src/app_modules/investasi/proses_investasi/view.tsx
deleted file mode 100644
index 8f3dc080..00000000
--- a/src/app_modules/investasi/proses_investasi/view.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-"use client";
-
-import { Warna } from "@/app/lib/warna";
-import {
-  Box,
-  Button,
-  Center,
-  Divider,
-  Group,
-  NumberInput,
-  Text,
-} from "@mantine/core";
-import { useFocusTrap } from "@mantine/hooks";
-import { useAtom } from "jotai";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-import { MODEL_INVESTASI } from "../_lib/interface";
-import { gs_TransferValue } from "../g_state";
-
-export default function ProsesInvestasi({
-  dataInvestasi,
-}: {
-  dataInvestasi: MODEL_INVESTASI;
-}) {
-  const router = useRouter();
-  const focusTrapRef = useFocusTrap();
-
-  const [jumlah, setJumlah] = useState(0);
-  const [hargaLembar, setHargaLembar] = useState<number>(
-    Number(dataInvestasi.hargaLembar)
-  );
-  const [total, setTotal] = useState(0);
-  const [investasi, setInvestasi] = useState(dataInvestasi);
-  const [maxPembelian, setMaxPembelian] = useState<number>(
-    Number(dataInvestasi.totalLembar)
-  );
-  const [transferValue, setTransferValue] = useAtom(gs_TransferValue);
-
-  // async function onBeli() {
-  //   setTransferValue({
-  //     ...transferValue,
-  //     totalTransfer: total as any,
-  //     lembarTerbeli: jumlah as any,
-  //   });
-  //   router.push(RouterInvestasi.metode_transfer + `${investasi.id}`);
-  // }
-  const date = new Date();
-  const randomId = date.getTime();
-
-  async function onProses() {
-    const body = {
-      transaction_details: {
-        order_id: "hipmi_" + `${randomId}`,
-        gross_amount: total,
-      },
-      item_details: [
-        {
-          id: "item_" + `${randomId}`,
-          name: investasi.title,
-          price: Number(investasi.hargaLembar),
-          quantity: transferValue.lembarTerbeli,
-          merchant_name: "Transaksi Saham",
-        },
-      ],
-      customer_details: {
-        first_name: "",
-        email: "test@midtrans.com",
-        phone: "+628123456",
-      },
-    };
-  }
-
-  return (
-    <>
-      {/* <pre>{JSON.stringify(investasi, null, 2)}</pre> */}
-      <Box px={"md"}>
-        {/* Sisa Lembar Saham */}
-        <Group position="apart" mb={"md"}>
-          <Text>Sisa Lembar Saham</Text>
-          <Text fz={23}>
-            {new Intl.NumberFormat("id-ID", {
-              maximumFractionDigits: 10,
-            }).format(+investasi.totalLembar)}{" "}
-          </Text>
-        </Group>
-
-        {/* Harga perlembar saham */}
-        <Group position="apart" mb={"md"}>
-          <Text>Harga Perlembar</Text>
-          <Text fz={23}>
-            Rp.{" "}
-            {new Intl.NumberFormat("id-ID", {
-              maximumFractionDigits: 10,
-            }).format(+investasi.hargaLembar)}{" "}
-          </Text>
-        </Group>
-
-        {/* Lembar saham */}
-        <Group position="apart" mb={"md"}>
-          <Box>
-            <Text>Jumlah Pembelian</Text>
-            <Text c={"orange"} fs={"italic"} fz={10}>
-              minimal pembelian 10 lembar
-            </Text>
-            {/* <Text c={"red"} fs={"italic"} fz={10}>
-                maximal pembelian {maxPembelian} lembar
-              </Text> */}
-          </Box>
-          <NumberInput
-            type="number"
-            ref={focusTrapRef}
-            w={100}
-            max={maxPembelian}
-            onChange={(val: number) => {
-              setTotal(val * hargaLembar);
-              setJumlah(val);
-              // console.log(val);
-            }}
-          />
-        </Group>
-
-        <Divider my={"lg"} />
-
-        <Group position="apart" mb={"md"}>
-          <Box>
-            <Text>Total Harga</Text>
-          </Box>
-          <Text fz={25}>Rp.{total} </Text>
-        </Group>
-
-        <Center>
-          {jumlah < 10 ? (
-            <Button w={350} radius={50} bg={"gray"} disabled>
-              Beli Saham
-            </Button>
-          ) : (
-            <Button
-              w={350}
-              radius={50}
-              bg={Warna.biru}
-              onClick={() => {
-                // onBeli();
-                onProses();
-              }}
-            >
-              Beli Saham
-            </Button>
-          )}
-        </Center>
-      </Box>
-
-      {/* <pre>{JSON.stringify(investasi, null, 2)}</pre> */}
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/proses_transaksi/layout.tsx b/src/app_modules/investasi/proses_transaksi/layout.tsx
index 928b9d6e..8f78d883 100644
--- a/src/app_modules/investasi/proses_transaksi/layout.tsx
+++ b/src/app_modules/investasi/proses_transaksi/layout.tsx
@@ -1,16 +1,11 @@
 "use client";
 
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { ActionIcon, AppShell, Box, Group, Header, Text } from "@mantine/core";
-import { useAtom } from "jotai";
-import React, { useState } from "react";
-import { gs_midtrans_snap } from "../g_state";
-import { IconArrowLeft } from "@tabler/icons-react";
-import { title } from "process";
-import { useRouter } from "next/navigation";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { useAtom } from "jotai";
+import { useRouter } from "next/navigation";
+import React from "react";
+import { gs_midtrans_snap } from "../g_state";
 
 export default function LayoutProsesTransaksiInvestasi({
   children,
diff --git a/src/app_modules/investasi/status_pesanan/layout.tsx b/src/app_modules/investasi/status_pesanan/layout.tsx
index 28849921..afe4d81c 100644
--- a/src/app_modules/investasi/status_pesanan/layout.tsx
+++ b/src/app_modules/investasi/status_pesanan/layout.tsx
@@ -1,13 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { ActionIcon, AppShell, Group, Header, Text } from "@mantine/core";
-import { IconArrowLeft } from "@tabler/icons-react";
-import router from "next/router";
-import { title } from "process";
 import React from "react";
 
 export default function LayoutStatusPesananInvestasi({
@@ -19,12 +13,10 @@ export default function LayoutStatusPesananInvestasi({
     <>
       <UIGlobal_LayoutTamplate
         header={
-          <UIGlobal_LayoutHeaderTamplate title="Status Transaksi" hideButtonLeft/>
-          // <Header height={50}>
-          //   <Group h={50} position="center" px={"md"}>
-          //     <Text>Status Transaksi</Text>
-          //   </Group>
-          // </Header>
+          <UIGlobal_LayoutHeaderTamplate
+            title="Status Transaksi"
+            hideButtonLeft
+          />
         }
       >
         {children}
diff --git a/src/app_modules/investasi/status_transaksi/gagal/layout.tsx b/src/app_modules/investasi/status_transaksi/gagal/layout.tsx
index 67e51f94..9e8126dc 100644
--- a/src/app_modules/investasi/status_transaksi/gagal/layout.tsx
+++ b/src/app_modules/investasi/status_transaksi/gagal/layout.tsx
@@ -2,22 +2,20 @@
 
 import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
 import { Warna } from "@/app/lib/warna";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 import {
-  AppShell,
-  Header,
-  Group,
-  CloseButton,
   ActionIcon,
-  Footer,
-  Center,
   Button,
-  Text,
+  Center,
+  CloseButton,
+  Footer,
+  Group,
+  Header,
+  Text
 } from "@mantine/core";
 import { useAtom } from "jotai";
 import { useRouter } from "next/navigation";
 import { gs_investas_menu } from "../../g_state";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
 
 export default function LayoutStatusTransaksiInvestasi_Gagal({
   children,
diff --git a/src/app_modules/investasi/status_transaksi/layout.tsx b/src/app_modules/investasi/status_transaksi/layout.tsx
deleted file mode 100644
index 1b163b91..00000000
--- a/src/app_modules/investasi/status_transaksi/layout.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-"use client";
-
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import {
-  ActionIcon,
-  AppShell,
-  Button,
-  Center,
-  CloseButton,
-  Footer,
-  Group,
-  Header,
-  Text,
-} from "@mantine/core";
-import { useAtom } from "jotai";
-import { useRouter } from "next/navigation";
-import React from "react";
-import { gs_investas_menu } from "../g_state";
-import { Warna } from "@/app/lib/warna";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-
-export default function LayoutStatusTransaksiInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const router = useRouter();
-  const [hotMenu, setHotMenu] = useAtom(gs_investas_menu);
-
-  return (
-    <>
-      <UIGlobal_LayoutTamplate
-        header={
-          <Header height={50}>
-            <Group position="apart" align="center" h={50} px={"md"}>
-              <CloseButton
-                size={"md"}
-                onClick={() => {
-                  router.push(RouterInvestasi_OLD.main_transaksi);
-                  setHotMenu(3);
-                }}
-              />
-              <Text>Status Transaksi</Text>
-              <ActionIcon variant="transparent" disabled></ActionIcon>
-            </Group>
-          </Header>
-        }
-        footer={
-          <Footer height={70} sx={{ borderStyle: "none" }}>
-            <Center>
-              <Button
-                w={300}
-                radius={50}
-                bg={Warna.biru}
-                onClick={() => {
-                  router.push(RouterInvestasi_OLD.main_investasi), setHotMenu(2);
-                }}
-              >
-                Kembali Ke Investasi
-              </Button>
-            </Center>
-          </Footer>
-        }
-      >
-        {children}
-      </UIGlobal_LayoutTamplate>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/transaksi/layout.tsx b/src/app_modules/investasi/transaksi/layout.tsx
index 0243621e..17d3f903 100644
--- a/src/app_modules/investasi/transaksi/layout.tsx
+++ b/src/app_modules/investasi/transaksi/layout.tsx
@@ -1,8 +1,7 @@
 "use client";
 
 import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell, Title } from "@mantine/core";
+import { Title } from "@mantine/core";
 import React from "react";
 
 export default function LayoutTransaksiInvestasi({
diff --git a/src/app_modules/investasi/transfer/layout.tsx b/src/app_modules/investasi/transfer/layout.tsx
deleted file mode 100644
index 82b3aa1a..00000000
--- a/src/app_modules/investasi/transfer/layout.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-"use client";
-
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import { Warna } from "@/app/lib/warna";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import {
-  ActionIcon,
-  AppShell,
-  Button,
-  Center,
-  CloseButton,
-  Footer,
-  Group,
-  Header,
-  Text,
-} from "@mantine/core";
-import { useAtom } from "jotai";
-import { useRouter } from "next/navigation";
-import React from "react";
-import { gs_investas_menu } from "../g_state";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-
-export default function LayoutTransferInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const router = useRouter();
-  const [hotMenu, setHotMenu] = useAtom(gs_investas_menu);
-
-  return (
-    <>
-      <AppComponentGlobal_LayoutTamplate
-        header={
-          <Header height={50}>
-            <Group position="apart" h={50} px={"md"}>
-              <CloseButton
-                size={"md"}
-                onClick={() => {
-                  router.push(RouterInvestasi_OLD.main_transaksi), setHotMenu(3);
-                }}
-              />
-              <Text>Transfer</Text>
-              <ActionIcon variant="transparent" disabled></ActionIcon>
-            </Group>
-          </Header>
-        }
-        // footer={
-        //   <Footer height={70} sx={{ borderStyle: "none" }}>
-            
-        //   </Footer>
-        // }
-      >
-        {children}
-      </AppComponentGlobal_LayoutTamplate>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/transfer/view.tsx b/src/app_modules/investasi/transfer/view.tsx
deleted file mode 100644
index 619f3ecc..00000000
--- a/src/app_modules/investasi/transfer/view.tsx
+++ /dev/null
@@ -1,240 +0,0 @@
-"use client";
-
-import { Warna } from "@/app/lib/warna";
-import {
-  AspectRatio,
-  Avatar,
-  Box,
-  Button,
-  Center,
-  CopyButton,
-  Divider,
-  FileButton,
-  Flex,
-  Grid,
-  Group,
-  Image,
-  Paper,
-  Stack,
-  Text,
-  Title,
-} from "@mantine/core";
-import { useInterval, useShallowEffect } from "@mantine/hooks";
-import { IconAlertTriangle } from "@tabler/icons-react";
-import moment from "moment";
-import { redirect, useRouter } from "next/navigation";
-
-import { useState } from "react";
-import Countdown from "react-countdown";
-import {
-  MODEL_INVESTASI,
-  MODEL_Transaksi_Investasi,
-} from "../_lib/interface";
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import { useAtom } from "jotai";
-import { gs_TransferValue, gs_investas_menu } from "../g_state";
-import funGantiStatusTransaksi_Investasi from "../fun/fun_ganti_status_transaksi";
-
-export default function TransferInvestasi({
-  dataTransaksi,
-}: {
-  dataTransaksi: MODEL_Transaksi_Investasi;
-}) {
-  const router = useRouter();
-  const [transaksi, setTransaksi] = useState(dataTransaksi);
-  const [countDown, setCountDown] = useState<number | any>({
-    jam: null,
-    menit: null,
-    detik: null,
-  });
-
-  // useShallowEffect(() => {
-  //   const inter = apa_kabar("2023-11-18");
-  //   return () => clearInterval(inter);
-  // }, []);
-  // function apa_kabar(date: string) {
-  //   let d = moment.duration(moment(date).diff(new Date()));
-  //   const inter = setInterval(() => {
-  //     d = moment.duration(+d - 1000, "milliseconds");
-
-  //     console.log(d.days(), "=", d.hours(), ":", d.minutes(), ":", d.seconds());
-  //   }, 1000);
-  //   return inter;
-  // }
-
-  // useShallowEffect(() => {
-  //   const mulai = moment(transaksi.createdAt).format();
-  //   const selesai = moment(transaksi.createdAt).add(1, "days").format();
-  //   const timer = funCountDown(mulai as any, selesai as any);
-
-  //   return () => clearInterval(timer);
-  // }, []);
-
-  // functionbaru ==========================//
-  const selesai = moment(transaksi.createdAt).add(1, "days").format();
-  let durasi = moment.duration(moment(selesai).diff(new Date()));
-  const interval = useInterval(() => {
-    durasi = moment.duration(+durasi - 1000, "milliseconds");
-    if (durasi.hours() <= 0 && durasi.minutes() <= 0 && durasi.seconds() <= 0) {
-      funGantiStatusTransaksi_Investasi(transaksi.id, "4").then((res) => {
-        if (res.status === 200) {
-          router.push(
-            RouterInvestasi_OLD.status_transaksi_gagal + `${transaksi.id}`
-          );
-          interval.stop();
-        }
-      });
-    }
-    setCountDown({
-      ...countDown,
-      jam: durasi.hours(),
-      menit: durasi.minutes(),
-      detik: durasi.seconds(),
-    });
-  }, 1000);
-
-  useShallowEffect(() => {
-    interval.start();
-  }, []);
-
-  return (
-    <>
-      {/* <pre>{JSON.stringify(transaksi, null,2)}</pre> */}
-      {/* {countDown.jam} */}
-      <Stack spacing={"lg"}>
-        <Stack spacing={0} mb={"xs"}>
-          <Text fz={12}>Mohon transfer untuk diteruskan ke :</Text>
-          <Group align="center">
-            <Title order={5}>{transaksi.Investasi.title}</Title>
-          </Group>
-          <Divider my={"md"} />
-          <Grid>
-            <Grid.Col span={4}>
-              <Text fz={"xs"}>Transfer sebelum</Text>
-            </Grid.Col>
-            <Grid.Col span={5}>
-              <Text fz={"xs"} fw={"bold"}>
-                {moment(transaksi.createdAt).format("lll")}
-              </Text>
-            </Grid.Col>
-            <Grid.Col span={3} fz={"xs"}>
-              <Paper bg={"red"} px={"xs"}>
-                <Center>
-                  {countDown.jam <= 0 &&
-                  countDown.menit <= 0 &&
-                  countDown.detik <= 0 ? (
-                    <Flex align={"center"} justify={"center"}>
-                      <Text fz={9}>Waktu Habis</Text>
-                    </Flex>
-                  ) : (
-                    <Box>
-                      {countDown.jam}:{countDown.menit}:{countDown.detik}
-                    </Box>
-                  )}
-                </Center>
-              </Paper>
-            </Grid.Col>
-          </Grid>
-        </Stack>
-
-        <Stack spacing={"xl"}>
-          {/* Nama Rekening */}
-          <Stack spacing={5}>
-            <Group>
-              <Avatar size={"md"} variant="filled" />
-              <Stack spacing={0}>
-                <Text>Bank {transaksi.namaBank}</Text>
-                <Text>PT. Xendit Jakarta</Text>
-              </Stack>
-            </Group>
-            <Paper
-              bg={"gray.3"}
-              sx={{ alignContent: "center" }}
-              p={"sm"}
-              radius={10}
-            >
-              <Grid align="center">
-                <Grid.Col span={8}>
-                  <Text fw={"bold"}>{transaksi.nomorRekening}</Text>
-                </Grid.Col>
-                <Grid.Col span={4}>
-                  <Center>
-                    <CopyButton value={transaksi.nomorRekening}>
-                      {({ copied, copy }) => (
-                        <Button
-                          variant="filled"
-                          radius={50}
-                          compact
-                          bg={copied ? "teal" : "gray"}
-                          color="gray"
-                          onClick={copy}
-                        >
-                          {copied ? "Tersalin" : "Salin"}
-                        </Button>
-                      )}
-                    </CopyButton>
-                  </Center>
-                </Grid.Col>
-              </Grid>
-            </Paper>
-          </Stack>
-
-          {/* Nomor rekening */}
-          <Stack spacing={5}>
-            <Text>Total Transfer</Text>
-            <Paper
-              bg={"gray.3"}
-              sx={{ alignContent: "center" }}
-              p={"sm"}
-              radius={10}
-            >
-              <Grid align="center">
-                <Grid.Col span={8}>
-                  {/* <Text fw={"bold"}>Rp. {transaksi.totalTransfer}</Text> */}
-                </Grid.Col>
-                <Grid.Col span={4}>
-                  <Center>
-                    {/* <CopyButton value={transaksi.totalTransfer}>
-                      {({ copied, copy }) => (
-                        <Button
-                          variant="filled"
-                          radius={50}
-                          compact
-                          bg={copied ? "teal" : "gray"}
-                          color="gray"
-                          onClick={copy}
-                        >
-                          {copied ? "Tersalin" : "Salin"}
-                        </Button>
-                      )}
-                    </CopyButton> */}
-                  </Center>
-                </Grid.Col>
-              </Grid>
-            </Paper>
-            <Group spacing={5}>
-              <IconAlertTriangle color="orange" size={10} />
-              <Text fz={"sm"}>Pastikan jumlahnya benar</Text>
-            </Group>
-          </Stack>
-        </Stack>
-      </Stack>
-
-      {/* Tombol Sudah Transfer */}
-      <Center mt={100}>
-        <Button
-          radius={50}
-          w={300}
-          bg={Warna.biru}
-          onClick={() => {
-            router.push(RouterInvestasi_OLD.dialog_transaksi);
-            // setHotMenu(1);
-            // router.push(RouterInvestasi.status_transaksi);
-          }}
-        >
-          Sudah Transfer
-        </Button>
-      </Center>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/upload/layout.tsx b/src/app_modules/investasi/upload/layout.tsx
deleted file mode 100644
index e55fa845..00000000
--- a/src/app_modules/investasi/upload/layout.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-"use client";
-
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell } from "@mantine/core";
-import React from "react";
-
-export default function LayoutUploadGambarInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <AppComponentGlobal_LayoutTamplate header={<ComponentGlobal_HeaderTamplate title="Upload Gambar Investasi" />}>
-        {children}
-      </AppComponentGlobal_LayoutTamplate>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/upload/view.tsx b/src/app_modules/investasi/upload/view.tsx
deleted file mode 100644
index 21c50c4b..00000000
--- a/src/app_modules/investasi/upload/view.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-"use client";
-
-import { Warna } from "@/app/lib/warna";
-import {
-  AspectRatio,
-  Button,
-  Center,
-  Divider,
-  FileButton,
-  Group,
-  Image,
-  Paper,
-  Text,
-  Title,
-} from "@mantine/core";
-import { useState } from "react";
-
-export default function UploadGambarInvestasi() {
-  const [img, setImg] = useState<any | null>();
-  return (
-    <>
-      <Group position="center">
-        <FileButton
-          onChange={async (files :  any) => {
-            const buffer = URL.createObjectURL(
-              new Blob([new Uint8Array( await files.arrayBuffer())])
-            );
-            setImg(buffer);
-          }}
-          accept="image/png,image/jpeg"
-        >
-          {(props) => <Button {...props}>Upload image</Button>}
-        </FileButton>
-      </Group>
-
-      {img && <Image alt="" src={img}/>}
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/upload_bukti/layout.tsx b/src/app_modules/investasi/upload_bukti/layout.tsx
deleted file mode 100644
index ff89bc31..00000000
--- a/src/app_modules/investasi/upload_bukti/layout.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-"use client";
-
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
-import { AppShell } from "@mantine/core";
-import React from "react";
-
-export default function LayoutBuktiTransferInvestasi({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <AppComponentGlobal_LayoutTamplate header={<ComponentGlobal_HeaderTamplate title="Upload Bukti Transfer" />}>
-        {children}
-      </AppComponentGlobal_LayoutTamplate>
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/upload_bukti/view.tsx b/src/app_modules/investasi/upload_bukti/view.tsx
deleted file mode 100644
index aa4a2bba..00000000
--- a/src/app_modules/investasi/upload_bukti/view.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-"use client";
-
-import { Warna } from "@/app/lib/warna";
-import {
-  AspectRatio,
-  Button,
-  FileButton,
-  Grid,
-  Group,
-  Image,
-  Text
-} from "@mantine/core";
-import { useShallowEffect } from "@mantine/hooks";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-
-export default function UploadBuktiTransferInvestasi() {
-  const router = useRouter();
-  const [fl, setFl] = useState<File | null>(null);
-  const [img, setImg] = useState<any | null>(null);
-  const [total, setTotal] = useState<any | null>(null);
-  const [bank, setBank] = useState<any | null>(null);
-
-  useShallowEffect(() => {
-    if (typeof window !== undefined) {
-      const totalHarga = localStorage.getItem("total_harga");
-      const pilihBank = localStorage.getItem("bank");
-      setTotal(totalHarga);
-      setBank(pilihBank);
-    }
-  }, []);
-
-  return (
-    <>
-      {/* Nama Rekening */}
-      <Grid align="center">
-        <Grid.Col span={5}>
-          <Text>Nama Rekening</Text>
-        </Grid.Col>
-        <Grid.Col span={7}>
-          <Text fw={"bold"}>Xendit</Text>
-        </Grid.Col>
-      </Grid>
-
-      {/* Nomor rekening */}
-      <Grid align="center">
-        <Grid.Col span={5}>
-          <Text>Nomor Rekening</Text>
-        </Grid.Col>
-        <Grid.Col span={7}>
-          <Text fw={"bold"}>{bank}</Text>
-        </Grid.Col>
-        {/* <Grid.Col span={"auto"}>
-          <CopyButton value="908765467897654567">
-            {({ copied, copy }) => (
-              <Button
-                compact
-                radius={50}
-                color={copied ? "teal" : "indigo"}
-                onClick={copy}
-              >
-                {copied ? "Copied url" : "Copy url"}
-              </Button>
-            )}
-          </CopyButton>
-        </Grid.Col> */}
-      </Grid>
-
-      {/* Total Bayar */}
-      <Grid align="center">
-        <Grid.Col span={5}>
-          <Text>Total Bayar</Text>
-        </Grid.Col>
-        <Grid.Col span={7}>
-          <Text fw={"bold"}>Rp. {total}</Text>
-        </Grid.Col>
-      </Grid>
-
-      {/* Upload */}
-      <Group position="center" mt="lg" mb={"md"}>
-        <FileButton
-          onChange={async (files: any) => {
-            const buffer = URL.createObjectURL(
-              new Blob([new Uint8Array(await files.arrayBuffer())])
-            );
-            setImg(buffer);
-            setFl(files);
-          }}
-          accept="image/png,image/jpeg"
-        >
-          {(props) => (
-            <Button
-              {...props}
-              // w={350}
-              compact
-              radius={50}
-              bg={Warna.biru}
-              // onClick={() => router.push("/dev/investasi/upload")}
-            >
-              Upload
-            </Button>
-          )}
-        </FileButton>
-      </Group>
-      <AspectRatio ratio={16 / 9} mb={"lg"}>
-        {img ? (
-          <Image alt="" src={img} />
-        ) : (
-          <Image alt="" src={"/aset/no-img.png"} />
-        )}
-      </AspectRatio>
-
-      {/* <Center>
-        {img === null ? (
-          <Button
-            disabled
-            w={350}
-            radius={50}
-            bg={"gray"}
-            onClick={() => toast("Masukan Bukti Transfer")}
-          >
-            Selesai
-          </Button>
-        ) : (
-          <Button
-            w={350}
-            radius={50}
-            bg={"blue"}
-            onClick={() => router.push("/dev/investasi/konfirmasi")}
-          >
-            Selesai
-          </Button>
-        )}
-      </Center> */}
-    </>
-  );
-}
diff --git a/src/app_modules/investasi/upload_dokumen/layout.tsx b/src/app_modules/investasi/upload_dokumen/layout.tsx
index 5a1b1cff..f14c041f 100644
--- a/src/app_modules/investasi/upload_dokumen/layout.tsx
+++ b/src/app_modules/investasi/upload_dokumen/layout.tsx
@@ -1,10 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { AppShell } from "@mantine/core";
 import React from "react";
 
 export default function LayoutUploadDokumenInvestasi({
diff --git a/src/app_modules/investasi/upload_prospektus/layout.tsx b/src/app_modules/investasi/upload_prospektus/layout.tsx
index 17806361..3e573b08 100644
--- a/src/app_modules/investasi/upload_prospektus/layout.tsx
+++ b/src/app_modules/investasi/upload_prospektus/layout.tsx
@@ -1,10 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import ComponentGlobal_HeaderTamplate from "@/app_modules/_global/header_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { AppShell } from "@mantine/core";
 import React from "react";
 
 export default function LayoutUploadProspektusInvestasi({
diff --git a/src/app_modules/job/component/header_tamplate.tsx b/src/app_modules/job/component/header_tamplate.tsx
deleted file mode 100644
index aecc7fee..00000000
--- a/src/app_modules/job/component/header_tamplate.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-"use client";
-
-import { Header, Group, ActionIcon, Text, Title } from "@mantine/core";
-import { IconArrowLeft, IconChevronLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-
-export default function ComponentJob_HeaderTamplate({
-  hideBack,
-  changeIconBack,
-  route,
-  route2,
-  title,
-  icon,
-  bg,
-}: {
-  hideBack?: boolean;
-  changeIconBack?: any;
-  route?: any;
-  route2?: any;
-  title: string;
-  icon?: any;
-  bg?: any;
-}) {
-  const router = useRouter();
-  const [isLoading, setLoading] = useState(false);
-  const [isRightLoading, setRightLoading] = useState(false);
-  return (
-    <>
-      <Header
-        height={50}
-        sx={{ borderStyle: "none" }}
-        bg={bg === null ? "" : bg}
-      >
-        <Group h={50} position="apart" px={"md"}>
-          {hideBack ? (
-            <ActionIcon variant="transparent" disabled></ActionIcon>
-          ) : (
-            <ActionIcon
-              loading={isLoading ? true : false}
-              variant="transparent"
-              onClick={() => {
-                setLoading(true);
-                if (route === null || route === undefined) {
-                  return router.back();
-                } else {
-                  return router.push(route);
-                }
-              }}
-            >
-              {changeIconBack ? changeIconBack : <IconChevronLeft />}
-            </ActionIcon>
-          )}
-          <Title order={5}>{title}</Title>
-          {(() => {
-            if (route2 === null || route2 === undefined) {
-              return <ActionIcon disabled variant="transparent"></ActionIcon>;
-            } else {
-              return (
-                <ActionIcon
-                  loading={isRightLoading ? true : false}
-                  variant="transparent"
-                  onClick={() => {
-                    setRightLoading(true);
-                    router.push(route2);
-                  }}
-                >
-                  {icon}
-                </ActionIcon>
-              );
-            }
-          })()}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/job/detail/reject/layout.tsx b/src/app_modules/job/detail/reject/layout.tsx
index 7688c2dc..3c5d5fbd 100644
--- a/src/app_modules/job/detail/reject/layout.tsx
+++ b/src/app_modules/job/detail/reject/layout.tsx
@@ -1,13 +1,8 @@
 "use client";
 
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentJob_HeaderTamplate from "../../component/header_tamplate";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import { RouterJob } from "@/app/lib/router_hipmi/router_job";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { IconEdit } from "@tabler/icons-react";
+import React from "react";
 
 export default function LayoutJob_DetailReject({
   children,
diff --git a/src/app_modules/katalog/component/header_tamplate.tsx b/src/app_modules/katalog/component/header_tamplate.tsx
deleted file mode 100644
index 8c65b1de..00000000
--- a/src/app_modules/katalog/component/header_tamplate.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-"use client";
-
-import { ActionIcon, Group, Header, Title } from "@mantine/core";
-import { IconChevronLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-
-export default function ComponentKatalog_HeaderTamplate({
-  hideBack,
-  changeIconBack,
-  route,
-  route2,
-  title,
-  icon,
-  bg,
-  titleColor,
-}: {
-  hideBack?: boolean;
-  changeIconBack?: any;
-  route?: any;
-  route2?: any;
-  title: string;
-  icon?: any;
-  bg?: any;
-  titleColor?: string
-}) {
-  const router = useRouter();
-  return (
-    <>
-      <Header
-        height={50}
-        sx={{ borderStyle: "none" }}
-        bg={bg === null ? "" : bg}
-      >
-        <Group h={50} position="apart" px={"md"}>
-          {hideBack ? (
-            <ActionIcon variant="transparent" disabled></ActionIcon>
-          ) : (
-            <ActionIcon
-              variant="transparent"
-              onClick={() => {
-                if (route === null || route === undefined) {
-                  return router.back();
-                } else {
-                  return router.push(route);
-                }
-              }}
-            >
-              {changeIconBack ? changeIconBack : <IconChevronLeft />}
-            </ActionIcon>
-          )}
-          <Title order={5} c={titleColor ? titleColor : "black"} >{title}</Title>
-          {(() => {
-            if (route2 === null || route2 === undefined) {
-              return <ActionIcon disabled variant="transparent"></ActionIcon>;
-            } else {
-              return (
-                <ActionIcon
-                  variant="transparent"
-                  onClick={() => router.push(route2)}
-                >
-                  {icon}
-                </ActionIcon>
-              );
-            }
-          })()}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/katalog/component/header_transparent.tsx b/src/app_modules/katalog/component/header_transparent.tsx
deleted file mode 100644
index 27c3c7e4..00000000
--- a/src/app_modules/katalog/component/header_transparent.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-"use client";
-
-import { Header, Group, ActionIcon, Text } from "@mantine/core";
-import { IconArrowLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import React from "react";
-
-export default function HeaderTransparent({
-  route,
-  icon2,
-  title,
-}: {
-  route: any;
-  icon2: any;
-  title: string;
-}) {
-  const router = useRouter();
-  return (
-    <>
-
-      <Header height={50} px={"sm"}>
-        <Group position="apart" h={50}>
-          <ActionIcon variant="transparent" onClick={() => router.push(route)}>
-            <IconArrowLeft />
-          </ActionIcon>
-
-          <Text>{title}</Text>
-          {icon2}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/katalog/index.ts b/src/app_modules/katalog/index.ts
index c95adbb5..9892f2b6 100644
--- a/src/app_modules/katalog/index.ts
+++ b/src/app_modules/katalog/index.ts
@@ -1,4 +1,2 @@
-import HeaderTransparent from "./component/header_transparent";
 
-export { HeaderTransparent as headerTransparent };
 export { Katalog_MainView } from "./view_katalog";
diff --git a/src/app_modules/katalog/portofolio/edit/layout.tsx b/src/app_modules/katalog/portofolio/edit/layout.tsx
deleted file mode 100644
index 96c5fb21..00000000
--- a/src/app_modules/katalog/portofolio/edit/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-"use client";
-
-import { AppShell } from "@mantine/core";
-import React from "react";
-import ComponentKatalog_HeaderTamplate from "../../component/header_tamplate";
-
-export default function LayoutPortofolio_EditBisnis({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <AppShell
-        header={<ComponentKatalog_HeaderTamplate title="Edit Portofolio" />}
-      >
-        {children}
-      </AppShell>
-    </>
-  );
-}
diff --git a/src/app_modules/katalog/portofolio/edit/logo/layout.tsx b/src/app_modules/katalog/portofolio/edit/logo/layout.tsx
index 577d70eb..df132625 100644
--- a/src/app_modules/katalog/portofolio/edit/logo/layout.tsx
+++ b/src/app_modules/katalog/portofolio/edit/logo/layout.tsx
@@ -1,10 +1,7 @@
 "use client";
 
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
 import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import ComponentKatalog_HeaderTamplate from "@/app_modules/katalog/component/header_tamplate";
-import { AppShell } from "@mantine/core";
 import React from "react";
 
 export default function LayoutPortofolio_EditLogoBisnis({
diff --git a/src/app_modules/katalog/portofolio/index.ts b/src/app_modules/katalog/portofolio/index.ts
index 6268cf40..062117f7 100644
--- a/src/app_modules/katalog/portofolio/index.ts
+++ b/src/app_modules/katalog/portofolio/index.ts
@@ -5,7 +5,6 @@ import Portofolio_UiDetail from "./ui/ui_detail_portofolio";
 import Portofolio_EditDataBisnis from "./edit/data/ui_edit_data";
 import Portofolio_EditLogoBisnis from "./edit/logo/ui_edit_logo";
 import Portofolio_EditMedsosBisnis from "./edit/medsos/ui_edit_medsos";
-import LayoutPortofolio_EditBisnis from "./edit/layout";
 import LayoutPortofolio_EditDataBisnis from "./edit/data/layout";
 import LayoutPortofolio_EditLogoBisnis from "./edit/logo/layout";
 import LayoutPortofolio_EditMedsosBisnis from "./edit/medsos/layout";
@@ -18,7 +17,6 @@ export {
   Portofolio_EditDataBisnis,
   Portofolio_EditLogoBisnis,
   Portofolio_EditMedsosBisnis,
-  LayoutPortofolio_EditBisnis,
   LayoutPortofolio_EditDataBisnis,
   LayoutPortofolio_EditLogoBisnis,
   LayoutPortofolio_EditMedsosBisnis,
diff --git a/src/app_modules/vote/component/header_tamplate.tsx b/src/app_modules/vote/component/header_tamplate.tsx
deleted file mode 100644
index f4adcf56..00000000
--- a/src/app_modules/vote/component/header_tamplate.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-"use client";
-
-import { Header, Group, ActionIcon, Text, Title } from "@mantine/core";
-import { IconArrowLeft, IconChevronLeft } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-
-export default function ComponentVote_HeaderTamplate({
-  hideBack,
-  changeIconBack,
-  route,
-  route2,
-  title,
-  icon,
-  bg,
-}: {
-  hideBack?: boolean;
-  changeIconBack?: any;
-  route?: any;
-  route2?: any;
-  title: string;
-  icon?: any;
-  bg?: any;
-}) {
-  const router = useRouter();
-  const [isLoading, setIsLoading] = useState(false);
-  const [isRightLoading, setRightLoading] = useState(false);
-
-  return (
-    <>
-      <Header
-        height={50}
-        sx={{ borderStyle: "none" }}
-        bg={bg === null ? "" : bg}
-      >
-        <Group h={50} position="apart" px={"md"}>
-          {hideBack ? (
-            <ActionIcon variant="transparent" disabled></ActionIcon>
-          ) : (
-            <ActionIcon
-              loading={isLoading ? true : false}
-              variant="transparent"
-              onClick={() => {
-                setIsLoading(true);
-                if (route === null || route === undefined) {
-                  return router.back();
-                } else {
-                  return router.push(route);
-                }
-              }}
-            >
-              {changeIconBack ? changeIconBack : <IconChevronLeft />}
-            </ActionIcon>
-          )}
-          <Title order={5}>{title}</Title>
-          {(() => {
-            if (route2 === null || route2 === undefined) {
-              return <ActionIcon disabled variant="transparent"></ActionIcon>;
-            } else {
-              return (
-                <ActionIcon
-                  loading={isRightLoading ? true : false}
-                  variant="transparent"
-                  onClick={() => {
-                    setRightLoading;
-                    true;
-                    router.push(route2);
-                  }}
-                >
-                  {icon}
-                </ActionIcon>
-              );
-            }
-          })()}
-        </Group>
-      </Header>
-    </>
-  );
-}
diff --git a/src/app_modules/vote/detail/draft/layout.tsx b/src/app_modules/vote/detail/draft/layout.tsx
index 9a13182c..78ca1440 100644
--- a/src/app_modules/vote/detail/draft/layout.tsx
+++ b/src/app_modules/vote/detail/draft/layout.tsx
@@ -1,14 +1,12 @@
 "use client";
 
-import { ActionIcon, AppShell } from "@mantine/core";
-import React, { useState } from "react";
-import ComponentVote_HeaderTamplate from "../../component/header_tamplate";
-import { IconDotsVertical, IconEdit } from "@tabler/icons-react";
 import { RouterVote } from "@/app/lib/router_hipmi/router_vote";
-import AppComponentGlobal_LayoutTamplate from "@/app_modules/_global/component_layout_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
 import UIGlobal_Drawer from "@/app_modules/_global/ui/ui_drawer";
+import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
+import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { ActionIcon } from "@mantine/core";
+import { IconDotsVertical, IconEdit } from "@tabler/icons-react";
+import React, { useState } from "react";
 
 export default function LayoutVote_DetailDraft({
   children,

From 6b8ace772c54aa00eebf9228da0d1543ed593d2d Mon Sep 17 00:00:00 2001
From: Bagasbanuna02 <bagasbanuna02@gmail.com>
Date: Mon, 18 Nov 2024 15:19:19 +0800
Subject: [PATCH 2/2] Fix: Navbar admin Deskripsi: - Fix bug navbar yang
 terpotong bagian atasnya - Fix version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2acd7b1a..1c99fc0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hipmi",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "private": true,
   "prisma": {
     "seed": "npx tsx prisma/seed.ts"