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" 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 <> - {children} - ; -} 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 ( - <> - - - ); -} 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 ( - <> - - {children} - - - ); -} 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<> - - - -} \ 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<> - {children} - -} \ 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 ( - <> - - - ); -} 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 <> - - -} \ 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 ( - <> - - - ); -} 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 ( - <> - {children} - - ); -} 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 ( - <> - - - ); -} 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 ( - <> - - - ); -} 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<> - {children} - -} \ 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 ( - <> - - - ); -} 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<> - - -} \ 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 ( - <> - {children} - - ); -} 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 ( - <> - - - ); -} 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 ( - <> - - - ); -} 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<> - {children} - -} \ 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 ( - <> - - - ); -} 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<> - - -} \ 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<> - {children} - -} \ 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 ( - <> - - - ); -} 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 ; -} 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 ( <> {children} 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 ( - <> -
- - { - setIsLoading(true); - if (route === null || route === undefined) { - return router.back(); - } else { - return router.push(route); - } - }} - > - - - {title} - {(() => { - if (route2 === null || route2 === undefined) { - return ; - } else { - return ( - { - setRightLoading(true); - router.push(route2); - }} - > - {icon} - - ); - } - })()} - -
- - ); -} 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 ( <> -
)} -
+ ); } 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 ? ( - - {header} - - ) : ( - "" - )} + + {header} + ); } 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 ( <> - + {icon} - + ); } 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 ( - <> - }> - {children} - - - ); -} 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) => ( - router.push(RouterAdminInvestasi_OLD.status_transfer)} - > - - - Username - - - Status Transfer - - - - ))} - - ); -} 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({ } /> - {/* setOpenModal(false)} - title="Alasan Penolakan" - size={"sm"} - centered - withCloseButton={false} - > - -