diff --git a/public/donasi/image/0aed0def-3278-41eb-be5c-9ba8f0ebdf6f.jpeg b/public/donasi/image/0aed0def-3278-41eb-be5c-9ba8f0ebdf6f.jpeg new file mode 100644 index 00000000..22cb9a6e Binary files /dev/null and b/public/donasi/image/0aed0def-3278-41eb-be5c-9ba8f0ebdf6f.jpeg differ diff --git a/public/donasi/image/70df004f-eeb0-4469-8f76-41897e712d97.jpeg b/public/donasi/image/70df004f-eeb0-4469-8f76-41897e712d97.jpeg new file mode 100644 index 00000000..d3ea1214 Binary files /dev/null and b/public/donasi/image/70df004f-eeb0-4469-8f76-41897e712d97.jpeg differ diff --git a/public/donasi/image/b832bd30-2c30-4fa2-b8bf-13ceebcbac1c.jpeg b/public/donasi/image/b832bd30-2c30-4fa2-b8bf-13ceebcbac1c.jpeg new file mode 100644 index 00000000..d0b9edda Binary files /dev/null and b/public/donasi/image/b832bd30-2c30-4fa2-b8bf-13ceebcbac1c.jpeg differ diff --git a/public/donasi/image/e85805b1-353d-4f5b-b016-226ba10e58c5.jpeg b/public/donasi/image/e85805b1-353d-4f5b-b016-226ba10e58c5.jpeg new file mode 100644 index 00000000..83e6366e Binary files /dev/null and b/public/donasi/image/e85805b1-353d-4f5b-b016-226ba10e58c5.jpeg differ diff --git a/public/donasi/image/ebba534b-7a83-4e67-abac-08da8482fcde.jpeg b/public/donasi/image/ebba534b-7a83-4e67-abac-08da8482fcde.jpeg new file mode 100644 index 00000000..6453d730 Binary files /dev/null and b/public/donasi/image/ebba534b-7a83-4e67-abac-08da8482fcde.jpeg differ diff --git a/public/donasi/image_cerita/16fc767f-18de-4390-93eb-cfc94f7620e3.jpeg b/public/donasi/image_cerita/16fc767f-18de-4390-93eb-cfc94f7620e3.jpeg new file mode 100644 index 00000000..22cb9a6e Binary files /dev/null and b/public/donasi/image_cerita/16fc767f-18de-4390-93eb-cfc94f7620e3.jpeg differ diff --git a/public/donasi/image_cerita/353d2dec-50eb-4b3a-8778-11256f57a644.jpeg b/public/donasi/image_cerita/353d2dec-50eb-4b3a-8778-11256f57a644.jpeg new file mode 100644 index 00000000..5652497a Binary files /dev/null and b/public/donasi/image_cerita/353d2dec-50eb-4b3a-8778-11256f57a644.jpeg differ diff --git a/public/donasi/image_cerita/58969439-ea34-4738-b4a3-df22f6da019b.jpeg b/public/donasi/image_cerita/58969439-ea34-4738-b4a3-df22f6da019b.jpeg new file mode 100644 index 00000000..d040a767 Binary files /dev/null and b/public/donasi/image_cerita/58969439-ea34-4738-b4a3-df22f6da019b.jpeg differ diff --git a/public/donasi/image_cerita/8f28ee52-1fef-47cb-a011-ade48aa025dd.jpeg b/public/donasi/image_cerita/8f28ee52-1fef-47cb-a011-ade48aa025dd.jpeg new file mode 100644 index 00000000..d3ea1214 Binary files /dev/null and b/public/donasi/image_cerita/8f28ee52-1fef-47cb-a011-ade48aa025dd.jpeg differ diff --git a/public/donasi/image_cerita/927e0798-4722-40f5-b7d1-e73d1d03d304.jpg b/public/donasi/image_cerita/927e0798-4722-40f5-b7d1-e73d1d03d304.jpg new file mode 100644 index 00000000..b71d094e Binary files /dev/null and b/public/donasi/image_cerita/927e0798-4722-40f5-b7d1-e73d1d03d304.jpg differ diff --git a/public/donasi/image_cerita/b1cd4f75-00b5-45f0-b132-e4714bfbffa8.jpg b/public/donasi/image_cerita/b1cd4f75-00b5-45f0-b132-e4714bfbffa8.jpg new file mode 100644 index 00000000..b71d094e Binary files /dev/null and b/public/donasi/image_cerita/b1cd4f75-00b5-45f0-b132-e4714bfbffa8.jpg differ diff --git a/public/donasi/image_cerita/f6192006-f93b-4222-8e89-41388732e970.jpeg b/public/donasi/image_cerita/f6192006-f93b-4222-8e89-41388732e970.jpeg new file mode 100644 index 00000000..6453d730 Binary files /dev/null and b/public/donasi/image_cerita/f6192006-f93b-4222-8e89-41388732e970.jpeg differ diff --git a/public/donasi/invoice/49823a9a-0a6f-4098-85f9-25fa20b235e1.jpg b/public/donasi/invoice/49823a9a-0a6f-4098-85f9-25fa20b235e1.jpg new file mode 100644 index 00000000..ea83eb05 Binary files /dev/null and b/public/donasi/invoice/49823a9a-0a6f-4098-85f9-25fa20b235e1.jpg differ diff --git a/src/app/dev/crowd/main/loading.tsx b/src/app/dev/crowd/main/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/crowd/main/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/donasi/cerita_penggalang/[id]/loading.tsx b/src/app/dev/donasi/cerita_penggalang/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/cerita_penggalang/[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/donasi/create/cerita_penggalang/[id]/loading.tsx b/src/app/dev/donasi/create/cerita_penggalang/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/create/cerita_penggalang/[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/donasi/create/create_donasi/loading.tsx b/src/app/dev/donasi/create/create_donasi/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/create/create_donasi/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/donasi/detail/detail_draft/[id]/loading.tsx b/src/app/dev/donasi/detail/detail_draft/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/detail/detail_draft/[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/donasi/detail/detail_draft/[id]/page.tsx b/src/app/dev/donasi/detail/detail_draft/[id]/page.tsx index 4439b3ae..f15353f6 100644 --- a/src/app/dev/donasi/detail/detail_draft/[id]/page.tsx +++ b/src/app/dev/donasi/detail/detail_draft/[id]/page.tsx @@ -2,7 +2,8 @@ import { DetailDraftDonasi } from "@/app_modules/donasi"; import { Donasi_getOneById } from "@/app_modules/donasi/fun/get/get_one_donasi_by_id"; export default async function Page({ params }: { params: { id: string } }) { - const dataDonasi = await Donasi_getOneById(params.id); + const donasiId = params.id + const dataDonasi = await Donasi_getOneById(donasiId); return ( <> diff --git a/src/app/dev/donasi/detail/detail_main/[id]/loading.tsx b/src/app/dev/donasi/detail/detail_main/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/detail/detail_main/[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/donasi/detail/detail_publish/[id]/loading.tsx b/src/app/dev/donasi/detail/detail_publish/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/detail/detail_publish/[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/donasi/detail/detail_reject/[id]/loading.tsx b/src/app/dev/donasi/detail/detail_reject/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/detail/detail_reject/[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/donasi/detail/detail_review/[id]/loading.tsx b/src/app/dev/donasi/detail/detail_review/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/detail/detail_review/[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/donasi/edit/edit_cerita/[id]/loading.tsx b/src/app/dev/donasi/edit/edit_cerita/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/edit/edit_cerita/[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/donasi/edit/edit_donasi/[id]/loading.tsx b/src/app/dev/donasi/edit/edit_donasi/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/edit/edit_donasi/[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/donasi/edit/edit_rekening/[id]/loading.tsx b/src/app/dev/donasi/edit/edit_rekening/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/edit/edit_rekening/[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/donasi/main/loading.tsx b/src/app/dev/donasi/main/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/main/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/donasi/page_pop_up/create/loading.tsx b/src/app/dev/donasi/page_pop_up/create/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/page_pop_up/create/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/donasi/proses_donasi/invoice/[id]/loading.tsx b/src/app/dev/donasi/proses_donasi/invoice/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/proses_donasi/invoice/[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/donasi/proses_donasi/masukan_donasi/[id]/loading.tsx b/src/app/dev/donasi/proses_donasi/masukan_donasi/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/proses_donasi/masukan_donasi/[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/donasi/proses_donasi/metode_pembayaran/[id]/loading.tsx b/src/app/dev/donasi/proses_donasi/metode_pembayaran/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/proses_donasi/metode_pembayaran/[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/donasi/proses_donasi/proses_transaksi/[id]/loading.tsx b/src/app/dev/donasi/proses_donasi/proses_transaksi/[id]/loading.tsx deleted file mode 100644 index 380b3fcd..00000000 --- a/src/app/dev/donasi/proses_donasi/proses_transaksi/[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/donasi/proses_donasi/proses_transaksi/[id]/page.tsx b/src/app/dev/donasi/proses_donasi/proses_transaksi/[id]/page.tsx index e9c2f0ed..b74a91c0 100644 --- a/src/app/dev/donasi/proses_donasi/proses_transaksi/[id]/page.tsx +++ b/src/app/dev/donasi/proses_donasi/proses_transaksi/[id]/page.tsx @@ -6,7 +6,6 @@ export default async function Page({ params }: { params: { id: string } }) { // console.log(params.id) const dataInvoice = await Donasi_getOneInvoiceById(params.id); const nomorAdmin = await donasi_getMasterNomorAdmin(); - console.log(nomorAdmin); return ( <> diff --git a/src/app_modules/crowd/main/layout.tsx b/src/app_modules/crowd/main/layout.tsx index 230e5ca1..3484fa77 100644 --- a/src/app_modules/crowd/main/layout.tsx +++ b/src/app_modules/crowd/main/layout.tsx @@ -1,8 +1,8 @@ "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 { RouterHome } from "@/app/lib/router_hipmi/router_home"; +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 LayoutMainCrowd({ @@ -10,19 +10,18 @@ export default function LayoutMainCrowd({ }: { children: React.ReactNode; }) { - const router = useRouter(); return ( <> - } > {children} - + ); } diff --git a/src/app_modules/crowd/main/view.tsx b/src/app_modules/crowd/main/view.tsx index 92675a41..65215aee 100644 --- a/src/app_modules/crowd/main/view.tsx +++ b/src/app_modules/crowd/main/view.tsx @@ -1,14 +1,15 @@ "use client"; import { RouterCrowd } from "@/app/lib/router_hipmi/router_crowd"; -import { Warna } from "@/app/lib/warna"; +import { + AccentColor, + MainColor, +} from "@/app_modules/_global/color/color_pallet"; +import ComponentGlobal_Loader from "@/app_modules/_global/component/loader"; import { gs_donasi_hot_menu } from "@/app_modules/donasi/global_state"; import { gs_investasiFooter } from "@/app_modules/investasi/g_state"; import { AspectRatio, - Button, - Center, - Flex, Grid, Image, Loader, @@ -21,7 +22,6 @@ import { IconChevronRight } from "@tabler/icons-react"; import { useAtom } from "jotai"; import { useRouter } from "next/navigation"; import { useState } from "react"; -import toast from "react-simple-toasts"; export default function MainCrowd() { const router = useRouter(); @@ -29,22 +29,38 @@ export default function MainCrowd() { const [donasiHotMenu, setDonasiHotMenu] = useAtom(gs_donasi_hot_menu); const [loadingInv, setLoadingInv] = useState(false); const [loadingDon, setLoadingDon] = useState(false); + return ( <> - + {/* - - + */} + Logo + + {/* INVESTASI */} { setLoadingInv(true); router.push(RouterCrowd.investasi); @@ -61,16 +77,26 @@ export default function MainCrowd() { - {loadingInv ? : } + {loadingInv ? ( + + ) : ( + + )} + + {/* DONASI */} { setLoadingDon(true); router.push(RouterCrowd.donasi); @@ -87,7 +113,11 @@ export default function MainCrowd() { - {loadingDon ? : } + {loadingDon ? ( + + ) : ( + + )} diff --git a/src/app_modules/crowd/splash/view.tsx b/src/app_modules/crowd/splash/view.tsx index 7bad5f81..65e4e84f 100644 --- a/src/app_modules/crowd/splash/view.tsx +++ b/src/app_modules/crowd/splash/view.tsx @@ -1,23 +1,20 @@ "use client"; -import { Warna } from "@/app/lib/warna"; -import { Center, Image, Paper, Stack, Text, Title } from "@mantine/core"; +import { RouterCrowd } from "@/app/lib/router_hipmi/router_crowd"; +import UIGlobal_SplashScreen from "@/app_modules/_global/ui/ui_splash"; import { useShallowEffect } from "@mantine/hooks"; +import { IconHeartHandshake } from "@tabler/icons-react"; import { useRouter } from "next/navigation"; export default function SplashCrowd() { const router = useRouter(); useShallowEffect(() => { - setTimeout(() => router.push("/dev/crowd/main"), 1000); + setTimeout(() => router.push(RouterCrowd.main), 1000); }, []); return ( <> -
- - - -
+ } /> ); } diff --git a/src/app_modules/donasi/component/box_publish.tsx b/src/app_modules/donasi/component/box_publish.tsx deleted file mode 100644 index 35d32c2b..00000000 --- a/src/app_modules/donasi/component/box_publish.tsx +++ /dev/null @@ -1,100 +0,0 @@ -"use client"; - -import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi"; -import { - SimpleGrid, - Box, - Stack, - Grid, - AspectRatio, - Paper, - Progress, - Divider, - Image, - Text, -} from "@mantine/core"; -import router from "next/router"; -import ComponentDonasi_TampilanHitungMundur from "./tampilan_hitung_mundur"; -import TampilanRupiahDonasi from "./tampilan_rupiah"; -import { MODEL_DONASI } from "../model/interface"; -import { useViewportSize } from "@mantine/hooks"; -import { useRouter } from "next/navigation"; -import { useState } from "react"; -import _ from "lodash"; -import ComponentDonasi_IsEmptyData from "./is_empty_data"; - -export default function ComponentDonasi_BoxPublish({ - dataDonasi, - path, -}: { - dataDonasi: MODEL_DONASI[]; - path: string; -}) { - const { height, width } = useViewportSize(); - const router = useRouter(); - const [donasi, setDonasi] = useState(dataDonasi); - return ( - <> - {_.isEmpty(dataDonasi) ? ( - - ) : ( - - {donasi.map((e, i) => ( - { - router.push(path + `${e.id}`); - }} - > - - - - - - Foto - - - - - - - - {e.title} - - - - - - Terkumpul - - - - - - - - {width > 575 ? "" : } - - - ))} - - )} - - ); -} diff --git a/src/app_modules/donasi/component/card_view/box_publish.tsx b/src/app_modules/donasi/component/card_view/box_publish.tsx new file mode 100644 index 00000000..1e4ff58e --- /dev/null +++ b/src/app_modules/donasi/component/card_view/box_publish.tsx @@ -0,0 +1,84 @@ +"use client"; + +import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi"; +import { AccentColor } from "@/app_modules/_global/color/color_pallet"; +import { + AspectRatio, + Box, + Grid, + Image, + Paper, + Progress, + Stack, + Text +} from "@mantine/core"; +import { useRouter } from "next/navigation"; +import ComponentDonasi_TampilanHitungMundur from "../tampilan_hitung_mundur"; +import TampilanRupiahDonasi from "../tampilan_rupiah"; + +export default function ComponentDonasi_CardPublish({ + data, + path, +}: { + data: any; + path: string; +}) { + + const router = useRouter(); + + return ( + <> + { + router.push(path + `${data.id}`); + }} + > + + + + + + Foto + + + + + + + + {data.title} + + + + + + Terkumpul + + + + + + + + {/* {width > 575 ? "" : } */} + + + + ); +} diff --git a/src/app_modules/donasi/component/card_view/card_status.tsx b/src/app_modules/donasi/component/card_view/card_status.tsx new file mode 100644 index 00000000..9577b339 --- /dev/null +++ b/src/app_modules/donasi/component/card_view/card_status.tsx @@ -0,0 +1,71 @@ +import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi"; +import { AccentColor } from "@/app_modules/_global/color/color_pallet"; +import { + Box, + Stack, + Grid, + AspectRatio, + Paper, + Image, + Text, +} from "@mantine/core"; +import { useRouter } from "next/navigation"; +import { MODEL_DONASI } from "../../model/interface"; + +export function ComponentDonasi_CardStatus({ + data, + path, +}: { + data: MODEL_DONASI; + path: string; +}) { + const router = useRouter(); + return ( + <> + router.push(path + `${data.id}`)} + > + + + + + + Foto + + + + + + + {data.title} + + + Terget Dana + + Rp.{" "} + {new Intl.NumberFormat("id-ID", { + maximumFractionDigits: 10, + }).format(+data.target)} + + + + + + {/* {width > 575 ? "" : } */} + + + + ); +} diff --git a/src/app_modules/donasi/component/detail_galang_dana/detail_data_donasi.tsx b/src/app_modules/donasi/component/detail_galang_dana/detail_data_donasi.tsx index 7876a7c8..0343271b 100644 --- a/src/app_modules/donasi/component/detail_galang_dana/detail_data_donasi.tsx +++ b/src/app_modules/donasi/component/detail_galang_dana/detail_data_donasi.tsx @@ -13,6 +13,7 @@ import { Text, } from "@mantine/core"; import TampilanRupiahDonasi from "../tampilan_rupiah"; +import { AccentColor, MainColor } from "@/app_modules/_global/color/color_pallet"; export default function ComponentDonasi_DetailDataGalangDana({ donasi, @@ -22,14 +23,30 @@ export default function ComponentDonasi_DetailDataGalangDana({ const router = useRouter(); return ( <> - + - Foto - {/* - */} + + Foto + {donasi.title} Durasi: {donasi.DonasiMaster_Durasi.name} hari @@ -38,13 +55,17 @@ export default function ComponentDonasi_DetailDataGalangDana({ Dana dibutuhkan - + <Title order={4} style={{ + color: MainColor.yellow + }}> <TampilanRupiahDonasi nominal={+donasi.target} /> Kategori - + <Title order={4} style={{ + color: MainColor.yellow + }}> {donasi.DonasiMaster_Ketegori.name} diff --git a/src/app_modules/donasi/component/detail_main/cerita_penggalang.tsx b/src/app_modules/donasi/component/detail_main/cerita_penggalang.tsx index e285b8d3..c84e81ee 100644 --- a/src/app_modules/donasi/component/detail_main/cerita_penggalang.tsx +++ b/src/app_modules/donasi/component/detail_main/cerita_penggalang.tsx @@ -7,6 +7,11 @@ import { Stack, Title, Paper, Group, ActionIcon, Text } from "@mantine/core"; import { IconCircleChevronRight } from "@tabler/icons-react"; import moment from "moment"; import { useState } from "react"; +import { + AccentColor, + MainColor, +} from "@/app_modules/_global/color/color_pallet"; +import ComponentGlobal_Loader from "@/app_modules/_global/component/loader"; export default function ComponentDonasi_CeritaPenggalangMain({ donasi, @@ -17,9 +22,22 @@ export default function ComponentDonasi_CeritaPenggalangMain({ const [isLoading, setLoading] = useState(false); return ( <> - + Cerita Penggalang Dana - + @@ -28,14 +46,21 @@ export default function ComponentDonasi_CeritaPenggalangMain({ )} { setLoading(true); router.push(RouterDonasi.cerita_penggalang + `${donasi.id}`); }} > - + {isLoading ? ( + + ) : ( + + )} {donasi.CeritaDonasi.cerita} diff --git a/src/app_modules/donasi/component/detail_main/detail_data_donasi.tsx b/src/app_modules/donasi/component/detail_main/detail_data_donasi.tsx index cecc2204..0e4fdb30 100644 --- a/src/app_modules/donasi/component/detail_main/detail_data_donasi.tsx +++ b/src/app_modules/donasi/component/detail_main/detail_data_donasi.tsx @@ -30,6 +30,11 @@ import { NotifBerhasil } from "../notifikasi/notif_berhasil"; import { Donasi_findDonaturByTokenId } from "../../fun/get/get_donatur_by_token_id"; import { useState } from "react"; import ComponentGlobal_CardLoadingOverlay from "@/app_modules/_global/loading_card"; +import { + AccentColor, + MainColor, +} from "@/app_modules/_global/color/color_pallet"; +import ComponentGlobal_Loader from "@/app_modules/_global/component/loader"; export function ComponentDonasi_DetailDataMain({ donasi, @@ -47,13 +52,20 @@ export function ComponentDonasi_DetailDataMain({ return ( <> - +
Foto @@ -86,7 +98,12 @@ export function ComponentDonasi_DetailDataMain({ Kategori - + <Title + order={4} + style={{ + color: MainColor.yellow, + }} + > {donasi.DonasiMaster_Ketegori.name} @@ -102,19 +119,25 @@ export function ComponentDonasi_DetailDataMain({ router.push(RouterDonasi.donatur + `${donasi.id}`); }} > - - + + {isLoadingDonatur ? ( - + ) : ( - + )} - - {countDonatur} - + {countDonatur} - Donatur + + Donatur + @@ -127,9 +150,13 @@ export function ComponentDonasi_DetailDataMain({ > {isLoadingKabar ? ( - + ) : ( - + )} Kabar Terbaru @@ -144,9 +171,13 @@ export function ComponentDonasi_DetailDataMain({ > {isLoadingPencairan ? ( - + ) : ( - + )} Pencairan Dana diff --git a/src/app_modules/donasi/component/detail_main/informasi_penggalang.tsx b/src/app_modules/donasi/component/detail_main/informasi_penggalang.tsx index 4e088959..e29e934a 100644 --- a/src/app_modules/donasi/component/detail_main/informasi_penggalang.tsx +++ b/src/app_modules/donasi/component/detail_main/informasi_penggalang.tsx @@ -16,6 +16,12 @@ import _ from "lodash"; import { useRouter } from "next/navigation"; import ComponentDonasi_NotedBox from "../noted_box"; import { useState } from "react"; +import { + AccentColor, + MainColor, +} from "@/app_modules/_global/color/color_pallet"; +import ComponentGlobal_Loader from "@/app_modules/_global/component/loader"; +import ComponentGlobal_BoxInformation from "@/app_modules/_global/component/box_information"; export default function ComponentDonasi_InformasiPenggalangMain({ author, @@ -27,21 +33,41 @@ export default function ComponentDonasi_InformasiPenggalangMain({ return ( <> {/* 
{JSON.stringify(author, null, 2)}
*/} - + Informasi Penggalang Dana - + Penggalang Dana { setLoading(true); router.push(RouterDonasi.penggalang_dana + `${author.id}`); }} > - + {isLoading ? ( + + ) : ( + + )} @@ -56,7 +82,7 @@ export default function ComponentDonasi_InformasiPenggalangMain({ {author.username} - diff --git a/src/app_modules/donasi/component/footer_button_donasi.tsx b/src/app_modules/donasi/component/footer_button_donasi.tsx index a55d4fa5..597d278f 100644 --- a/src/app_modules/donasi/component/footer_button_donasi.tsx +++ b/src/app_modules/donasi/component/footer_button_donasi.tsx @@ -5,6 +5,7 @@ import { useAtom } from "jotai"; import { useRouter } from "next/navigation"; import { gs_proses_donasi } from "../global_state"; import { useState } from "react"; +import { MainColor } from "@/app_modules/_global/color/color_pallet"; export default function ButtonDonasi({ donasiId }: { donasiId: string }) { const router = useRouter(); @@ -24,7 +25,11 @@ export default function ButtonDonasi({ donasiId }: { donasiId: string }) { return ( <> -