diff --git a/src/app/dev/investasi/status-transaksi/berhasil/[id]/page.tsx b/src/app/dev/investasi/status-transaksi/berhasil/[id]/page.tsx index b0ba588d..12ad32af 100644 --- a/src/app/dev/investasi/status-transaksi/berhasil/[id]/page.tsx +++ b/src/app/dev/investasi/status-transaksi/berhasil/[id]/page.tsx @@ -1,5 +1,3 @@ -import { StatusTransaksiInvestasi } from "@/app_modules/investasi"; -import { investasi_funGetOneInvoiceById } from "@/app_modules/investasi/_fun/get/fun_get_one_invoice_by_id"; import { Investasi_UiTransaksiBerhasil } from "@/app_modules/investasi/_ui"; export default async function Page({params}: {params: {id: string}}) { diff --git a/src/app_modules/investasi/_component/detail/saham_saya/comp_detail_data.tsx b/src/app_modules/investasi/_component/detail/saham_saya/comp_detail_data.tsx index 5df62a04..f15deaa6 100644 --- a/src/app_modules/investasi/_component/detail/saham_saya/comp_detail_data.tsx +++ b/src/app_modules/investasi/_component/detail/saham_saya/comp_detail_data.tsx @@ -4,18 +4,12 @@ import { ComponentGlobal_LoadImageLandscape, } from "@/app_modules/_global/component"; import { MODEL_INVOICE_INVESTASI } from "@/app_modules/investasi/_lib/interface"; -import { - Box, - Grid, - SimpleGrid, - Stack, - Text, - Title -} from "@mantine/core"; +import { Box, Grid, SimpleGrid, Stack, Text, Title } from "@mantine/core"; import { Investasi_ComponentBoxDaftarBerita } from "../comp_box_daftar_berita"; import { Investasi_ComponentBoxDaftarDokumen } from "../comp_box_daftar_dokumen"; import { Investasi_ComponentBoxProspektus } from "../comp_box_prospektus"; import { MainColor } from "@/app_modules/_global/color"; +import { Investasi_ComponentBoxInvestor } from "../comp_box_investor"; export function Investasi_ComponentBoxDetailData({ data, @@ -116,6 +110,8 @@ export function Investasi_ComponentBoxDetailData({ { maxWidth: "36rem", cols: 1, spacing: "sm" }, ]} > + + diff --git a/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx b/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx index e6da620d..4ed6de0e 100644 --- a/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx +++ b/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx @@ -27,6 +27,11 @@ import { Investasi_ViewDetailReject, Investasi_ViewDetailReview, } from "../../_view"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewHeader, + UI_NewChildren, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; export function Investasi_UiDetailPortofolio() { const params = useParams<{ id: string }>(); @@ -88,10 +93,11 @@ export function Investasi_UiDetailPortofolio() { ); } + // DRAFT if (data.masterStatusInvestasiId == "3") return ( <> - - + */} + + + + setOpenDrawer(true)} + > + + + } + /> + + + + + { setPageId(e?.id); setLoading(true); - + router.push(e?.path, { scroll: false }); }} > @@ -144,20 +169,34 @@ export function Investasi_UiDetailPortofolio() { ); return ( - - } - > - {data.masterStatusInvestasiId === "2" && ( - - )} + // + // } + // > + // {data.masterStatusInvestasiId === "2" && ( + // + // )} - {data.masterStatusInvestasiId === "4" && ( - - )} - + // {data.masterStatusInvestasiId === "4" && ( + // + // )} + // + + + + + + {data.masterStatusInvestasiId === "2" && ( + + )} + + {data.masterStatusInvestasiId === "4" && ( + + )} + + ); } diff --git a/src/app_modules/investasi/_ui/detail/ui_detail_saham_saya.tsx b/src/app_modules/investasi/_ui/detail/ui_detail_saham_saya.tsx index a8176545..c8a3f630 100644 --- a/src/app_modules/investasi/_ui/detail/ui_detail_saham_saya.tsx +++ b/src/app_modules/investasi/_ui/detail/ui_detail_saham_saya.tsx @@ -3,15 +3,26 @@ import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; import { Investasi_ViewDetailSahamSaya } from "../../_view"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { UI_NewHeader, UI_NewChildren } from "@/app_modules/_global/ui/V2_layout_tamplate"; export function Investasi_UiDetailSahamSaya() { return ( <> - } > - + */} + + + + + + + + + > ); } diff --git a/src/app_modules/investasi/_ui/edit/ui_edit_investasi_new.tsx b/src/app_modules/investasi/_ui/edit/ui_edit_investasi_new.tsx index ec214403..b58e90a8 100644 --- a/src/app_modules/investasi/_ui/edit/ui_edit_investasi_new.tsx +++ b/src/app_modules/investasi/_ui/edit/ui_edit_investasi_new.tsx @@ -1,16 +1,33 @@ "use client"; -import { UIGlobal_LayoutHeaderTamplate, UIGlobal_LayoutTamplate, } from "@/app_modules/_global/ui"; +import { + UIGlobal_LayoutHeaderTamplate, + UIGlobal_LayoutTamplate, +} from "@/app_modules/_global/ui"; import { Investasi_ViewEditInvestasiNew } from "../../_view/edit/view_edit_investasi_new"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewHeader, + UI_NewChildren, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; export function Investasi_UiEditInvestasiNew() { - return ( - <> - } - > - - - > - ); + return ( + <> + {/* } + > + + */} + + + + + + + + + + > + ); } diff --git a/src/app_modules/investasi/_ui/edit/ui_edit_prospektus.tsx b/src/app_modules/investasi/_ui/edit/ui_edit_prospektus.tsx index 92f02d46..648d2b9f 100644 --- a/src/app_modules/investasi/_ui/edit/ui_edit_prospektus.tsx +++ b/src/app_modules/investasi/_ui/edit/ui_edit_prospektus.tsx @@ -1,19 +1,28 @@ "use client"; -import { - UIGlobal_LayoutHeaderTamplate, - UIGlobal_LayoutTamplate, -} from "@/app_modules/_global/ui"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import { Investasi_ViewEditProspektus } from "../../_view"; export function Investasi_UiEditProspektus() { return ( <> - } > - + */} + + + + + + + + > ); } diff --git a/src/app_modules/investasi/_ui/file_view/ui_file_view_dokumen.tsx b/src/app_modules/investasi/_ui/file_view/ui_file_view_dokumen.tsx index a145b8c8..5339404d 100644 --- a/src/app_modules/investasi/_ui/file_view/ui_file_view_dokumen.tsx +++ b/src/app_modules/investasi/_ui/file_view/ui_file_view_dokumen.tsx @@ -2,6 +2,7 @@ import { MainColor } from "@/app_modules/_global/color"; import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; import { apiGetPdfToImage, PageData, @@ -9,6 +10,7 @@ import { import { UIGlobal_DrawerCustom } from "@/app_modules/_global/ui"; import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import UI_NewLayoutTamplate, { UI_NewHeader, UI_NewChildren } from "@/app_modules/_global/ui/V2_layout_tamplate"; import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; import { ActionIcon, Box, Stack, Text } from "@mantine/core"; import { IconDotsVertical, IconDownload, IconX } from "@tabler/icons-react"; @@ -67,7 +69,7 @@ export function Investasi_UiFileViewDokumen() { return ( <> - )} - + */} + + + + } + customButtonRight={ + { + setOpen(true); + }} + > + + + } + /> + + + + {loading ? ( + + ) : error ? ( + + + + + ) : ( + + {pdfPages?.map((page, index) => ( + + ))} + + )} + + + setOpen(false)} diff --git a/src/app_modules/investasi/_ui/file_view/ui_file_view_prospektus.tsx b/src/app_modules/investasi/_ui/file_view/ui_file_view_prospektus.tsx index fca16f2a..0256eb01 100644 --- a/src/app_modules/investasi/_ui/file_view/ui_file_view_prospektus.tsx +++ b/src/app_modules/investasi/_ui/file_view/ui_file_view_prospektus.tsx @@ -2,6 +2,7 @@ import { MainColor } from "@/app_modules/_global/color"; import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; import { apiGetPdfToImage, PageData, @@ -9,6 +10,10 @@ import { import { UIGlobal_DrawerCustom } from "@/app_modules/_global/ui"; import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import UI_NewLayoutTamplate, { + UI_NewHeader, + UI_NewChildren, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; import { ActionIcon, Box, Stack, Text } from "@mantine/core"; import { IconDotsVertical, IconDownload, IconX } from "@tabler/icons-react"; @@ -70,7 +75,7 @@ export function Investasi_UiFileViewProspektus() { return ( <> - - {/* */} ) : ( )} - + */} + + + + } + customButtonRight={ + loading ? ( + + ) : error && error !== "" ? ( + + ) : ( + { + setOpen(true); + }} + > + + + ) + } + /> + + + + {loading ? ( + + ) : error && error !== "" ? ( + + + {/* */} + + ) : ( + + {pdfPages?.map((page, index) => ( + + ))} + + )} + + + setOpen(false)} diff --git a/src/app_modules/investasi/_ui/status_transaksi/ui_transaksi_berhasil.tsx b/src/app_modules/investasi/_ui/status_transaksi/ui_transaksi_berhasil.tsx index a6c50ec9..32b8fbca 100644 --- a/src/app_modules/investasi/_ui/status_transaksi/ui_transaksi_berhasil.tsx +++ b/src/app_modules/investasi/_ui/status_transaksi/ui_transaksi_berhasil.tsx @@ -1,19 +1,18 @@ "use client"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import { RouterInvestasi_OLD } from "@/lib/router_hipmi/router_investasi"; -import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; import { ActionIcon, Loader } from "@mantine/core"; import { IconX } from "@tabler/icons-react"; import { useAtom } from "jotai"; -import { useParams, useRouter } from "next/navigation"; +import { useRouter } from "next/navigation"; import { useState } from "react"; import { Investasi_ViewTransaksiBerhasil } from "../../_view"; import { gs_investas_menu } from "../../g_state"; -import { useShallowEffect } from "@mantine/hooks"; -import { apiGetOneSahamInvestasiById } from "../../_lib/api_fetch_new_investasi"; -import { MODEL_INVOICE_INVESTASI } from "../../_lib/interface"; -import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; export function Investasi_UiTransaksiBerhasil() { const router = useRouter(); @@ -21,9 +20,32 @@ export function Investasi_UiTransaksiBerhasil() { const [isLoading, setLoading] = useState(false); return ( - { + // setHotMenu(3); + // setLoading(true); + // router.push(RouterInvestasi_OLD.main_transaksi); + // }} + // > + // {isLoading ? : } + // + // } + // /> + // } + // > + + // + // + + + + } /> - } - > - - - - + + + + + ); } diff --git a/src/app_modules/investasi/_ui/status_transaksi/ui_transaksi_gagal.tsx b/src/app_modules/investasi/_ui/status_transaksi/ui_transaksi_gagal.tsx index bfd59a75..fa67dab6 100644 --- a/src/app_modules/investasi/_ui/status_transaksi/ui_transaksi_gagal.tsx +++ b/src/app_modules/investasi/_ui/status_transaksi/ui_transaksi_gagal.tsx @@ -1,8 +1,11 @@ "use client"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import { RouterInvestasi_OLD } from "@/lib/router_hipmi/router_investasi"; -import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; import { ActionIcon, Loader } from "@mantine/core"; import { IconX } from "@tabler/icons-react"; import { useAtom } from "jotai"; @@ -17,9 +20,31 @@ export function Investasi_UiTransaksiGagal() { const [isLoading, setLoading] = useState(false); return ( - { + // setHotMenu(3); + // setLoading(true); + // router.push(RouterInvestasi_OLD.main_transaksi); + // }} + // > + // {isLoading ? : } + // + // } + // /> + // } + // > + // + // + + + + } /> - } - > - - + + + + + ); } diff --git a/src/app_modules/investasi/_view/edit/view_edit_prospektus.tsx b/src/app_modules/investasi/_view/edit/view_edit_prospektus.tsx index 6eabdebf..9ad4ba4b 100644 --- a/src/app_modules/investasi/_view/edit/view_edit_prospektus.tsx +++ b/src/app_modules/investasi/_view/edit/view_edit_prospektus.tsx @@ -4,20 +4,9 @@ import { ComponentGlobal_ButtonUploadFileImage, ComponentGlobal_CardStyles, } from "@/app_modules/_global/component"; -import { - Box, - Button, - Center, - Grid, - Stack, - Text -} from "@mantine/core"; -import { - IconCircleCheck, - IconFileTypePdf -} from "@tabler/icons-react"; +import { Box, Button, Center, Grid, Stack, Text } from "@mantine/core"; +import { IconCircleCheck, IconFileTypePdf } from "@tabler/icons-react"; -import { DIRECTORY_ID } from "@/lib"; import { funGlobal_DeleteFileById, funGlobal_UploadToStorage, @@ -26,6 +15,7 @@ import { ComponentGlobal_NotifikasiBerhasil, ComponentGlobal_NotifikasiPeringatan, } from "@/app_modules/_global/notif_global"; +import { DIRECTORY_ID } from "@/lib"; import { clientLogger } from "@/util/clientLogger"; import { useShallowEffect } from "@mantine/hooks"; import { useParams, useRouter } from "next/navigation"; @@ -160,7 +150,7 @@ export function Investasi_ViewEditProspektus() { transition: "all 0.3s ease", position: "absolute", bottom: 20, - width: "90%", + width: 300, }} onClick={() => { onUpload();