diff --git a/src/app_modules/_global/color/color_pallet.ts b/src/app_modules/_global/color/color_pallet.ts index 6b417815..bb9d7e65 100644 --- a/src/app_modules/_global/color/color_pallet.ts +++ b/src/app_modules/_global/color/color_pallet.ts @@ -4,7 +4,8 @@ export const MainColor = { yellow: "#E1B525", white: "#D4D0D0", red: "#C74E4E", - orange: "#E58958" + orange: "#E58958", + green: "#468A56" }; export const AccentColor = { diff --git a/src/app_modules/_global/component/comp_card_box_and_background.tsx b/src/app_modules/_global/component/comp_card_box_and_background.tsx index c3064edd..cee4c5f7 100644 --- a/src/app_modules/_global/component/comp_card_box_and_background.tsx +++ b/src/app_modules/_global/component/comp_card_box_and_background.tsx @@ -1,4 +1,4 @@ -import { AccentColor } from "@/app_modules/_global/color"; +import { AccentColor, MainColor } from "@/app_modules/_global/color"; import { Card } from "@mantine/core"; import React from "react"; @@ -30,7 +30,7 @@ export function ComponentGlobal_CardStyles({ paddingInline: "16px", paddingBlock: "16px", borderRadius: "10px", - color: color ? color : "white", + color: color ? color : MainColor.white, height: height ? height : "auto", marginBottom: marginBottom ? marginBottom : "15px", }} diff --git a/src/app_modules/_global/component/comp_tampilan_angka_ratusan.tsx b/src/app_modules/_global/component/comp_tampilan_angka_ratusan.tsx index aa7b2565..ccf3c540 100644 --- a/src/app_modules/_global/component/comp_tampilan_angka_ratusan.tsx +++ b/src/app_modules/_global/component/comp_tampilan_angka_ratusan.tsx @@ -1,4 +1,5 @@ import { Group, Text } from "@mantine/core"; +import { MainColor } from "../color"; export default function ComponentGlobal_TampilanAngkaRatusan({ nominal, @@ -32,7 +33,7 @@ export default function ComponentGlobal_TampilanAngkaRatusan({ fw={fontWeight ? fontWeight : "bold"} fz={fontSize ? fontSize : "md"} style={{ - color: color ? color : "white", + color: color ? color : MainColor.white, }} > {new Intl.NumberFormat("id-ID", { maximumFractionDigits: 10 }).format( @@ -43,6 +44,9 @@ export default function ComponentGlobal_TampilanAngkaRatusan({ {textAfter} diff --git a/src/app_modules/_global/component/comp_tampilan_rupiah.tsx b/src/app_modules/_global/component/comp_tampilan_rupiah.tsx index 9271882f..e5baf1a3 100644 --- a/src/app_modules/_global/component/comp_tampilan_rupiah.tsx +++ b/src/app_modules/_global/component/comp_tampilan_rupiah.tsx @@ -1,4 +1,5 @@ import { Text } from "@mantine/core"; +import { MainColor } from "../color"; export default function ComponentGlobal_TampilanRupiah({ nominal, @@ -17,7 +18,7 @@ export default function ComponentGlobal_TampilanRupiah({ fw={fontWeight ? fontWeight : "bold"} fz={fontSize ? fontSize : "md"} style={{ - color: color ? color : "white", + color: color ? color : MainColor.white, }} > Rp.{" "} diff --git a/src/app_modules/_global/ui/ui_drawer.tsx b/src/app_modules/_global/ui/ui_drawer.tsx index b1f51ef3..fad1cd9d 100644 --- a/src/app_modules/_global/ui/ui_drawer.tsx +++ b/src/app_modules/_global/ui/ui_drawer.tsx @@ -64,7 +64,7 @@ export default function UIGlobal_Drawer({ borderRight: `1px solid ${AccentColor.blue}`, borderLeft: `1px solid ${AccentColor.blue}`, borderRadius: "20px 20px 0px 0px", - color: "white", + color: MainColor.white, paddingBottom: "5%", }, }} @@ -86,7 +86,7 @@ export default function UIGlobal_Drawer({ > {/* PAKE LOADING */} {/* {isLoading && e?.id === pageId ? ( diff --git a/src/app_modules/donasi/component/card_view/card_publish_new.tsx b/src/app_modules/donasi/component/card_view/card_publish_new.tsx index 885fa359..c832683f 100644 --- a/src/app_modules/donasi/component/card_view/card_publish_new.tsx +++ b/src/app_modules/donasi/component/card_view/card_publish_new.tsx @@ -5,6 +5,7 @@ import { Grid, Progress, Stack, Text } from "@mantine/core"; import { useRouter } from "next/navigation"; import ComponentDonasi_TampilanHitungMundur from "../tampilan_hitung_mundur"; import TampilanRupiahDonasi from "../tampilan_rupiah"; +import { MainColor } from "@/app_modules/_global/color"; export default function ComponentDonasi_CardPublishNew({ data }: { data: any; }) { const router = useRouter(); @@ -27,7 +28,7 @@ export default function ComponentDonasi_CardPublishNew({ data }: { data: any; }) - + {data.title} - Terkumpul - + Terkumpul + diff --git a/src/app_modules/donasi/component/detail_main/informasi_penggalang_new.tsx b/src/app_modules/donasi/component/detail_main/informasi_penggalang_new.tsx index 433fff92..19d8af63 100644 --- a/src/app_modules/donasi/component/detail_main/informasi_penggalang_new.tsx +++ b/src/app_modules/donasi/component/detail_main/informasi_penggalang_new.tsx @@ -2,7 +2,8 @@ import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi"; import { AccentColor, MainColor, } from "@/app_modules/_global/color/color_pallet"; import ComponentGlobal_BoxInformation from "@/app_modules/_global/component/box_information"; -import { ActionIcon, Avatar, Group, Paper, Skeleton, Stack, Text, Title, } from "@mantine/core"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { ActionIcon, Avatar, Group, Paper, Stack, Text, Title } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; import { IconCircleChevronRight } from "@tabler/icons-react"; import _ from "lodash"; @@ -54,7 +55,7 @@ export default function ComponentDonasi_InformasiPenggalangMainNew() { }} > { - loading ? + loading ? : diff --git a/src/app_modules/donasi/component/detail_main/skeleton_cerita_penggalang.tsx b/src/app_modules/donasi/component/detail_main/skeleton_cerita_penggalang.tsx index 3c3eb2d7..ffb25e4a 100644 --- a/src/app_modules/donasi/component/detail_main/skeleton_cerita_penggalang.tsx +++ b/src/app_modules/donasi/component/detail_main/skeleton_cerita_penggalang.tsx @@ -1,13 +1,14 @@ -import { Box, Skeleton } from "@mantine/core"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { Box } from "@mantine/core"; export default function SkeletonCeritaPenggalangDonasi() { return ( <> - - - - + + + + ); diff --git a/src/app_modules/donasi/component/detail_main/skeleton_detail_dana_donasi.tsx b/src/app_modules/donasi/component/detail_main/skeleton_detail_dana_donasi.tsx index a8f287a6..ea512c2a 100644 --- a/src/app_modules/donasi/component/detail_main/skeleton_detail_dana_donasi.tsx +++ b/src/app_modules/donasi/component/detail_main/skeleton_detail_dana_donasi.tsx @@ -1,19 +1,20 @@ -import { Box, Skeleton } from "@mantine/core"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { Box } from "@mantine/core"; export default function SkeletonDetailDanaDonasi() { return ( <> - + - - - + + + - + diff --git a/src/app_modules/donasi/component/skeleton_donasi.tsx b/src/app_modules/donasi/component/skeleton_donasi.tsx index 7f461e64..333d70af 100644 --- a/src/app_modules/donasi/component/skeleton_donasi.tsx +++ b/src/app_modules/donasi/component/skeleton_donasi.tsx @@ -1,5 +1,6 @@ import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component"; -import { Box, Grid, Skeleton } from "@mantine/core"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { Box, Grid } from "@mantine/core"; export default function SkeletonDonasi() { return <> @@ -8,7 +9,7 @@ export default function SkeletonDonasi() { - + @@ -16,7 +17,7 @@ export default function SkeletonDonasi() { - + diff --git a/src/app_modules/donasi/component/skeleton_donasi_saya.tsx b/src/app_modules/donasi/component/skeleton_donasi_saya.tsx index 1b3b3a2b..998e328e 100644 --- a/src/app_modules/donasi/component/skeleton_donasi_saya.tsx +++ b/src/app_modules/donasi/component/skeleton_donasi_saya.tsx @@ -1,5 +1,6 @@ import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component"; -import { Box, Grid, Skeleton } from "@mantine/core"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { Box, Grid } from "@mantine/core"; export default function SkeletonDonasiSaya() { return <> @@ -13,7 +14,7 @@ export default function SkeletonDonasiSaya() { - + @@ -22,7 +23,7 @@ export default function SkeletonDonasiSaya() { - + diff --git a/src/app_modules/donasi/edit/edit_donasi/skeleton_edit_donasi.tsx b/src/app_modules/donasi/edit/edit_donasi/skeleton_edit_donasi.tsx index 922e275e..e073fcc9 100644 --- a/src/app_modules/donasi/edit/edit_donasi/skeleton_edit_donasi.tsx +++ b/src/app_modules/donasi/edit/edit_donasi/skeleton_edit_donasi.tsx @@ -1,20 +1,21 @@ -import { Box, Skeleton, Stack } from "@mantine/core"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { Box, Stack } from "@mantine/core"; export default function SkeletonEditDonasi() { return ( <> - - - + + + {[...Array(5)].map((_, index) => ( - + ))} - + diff --git a/src/app_modules/event/component/skeleton/comp_skeleton_detail.tsx b/src/app_modules/event/component/skeleton/comp_skeleton_detail.tsx index 200491a5..2b30756c 100644 --- a/src/app_modules/event/component/skeleton/comp_skeleton_detail.tsx +++ b/src/app_modules/event/component/skeleton/comp_skeleton_detail.tsx @@ -1,5 +1,6 @@ import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component"; -import { Stack, Center, Skeleton, Grid } from "@mantine/core"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { Center, Grid, Stack } from "@mantine/core"; export function Event_ComponentSkeletonDetail() { return ( @@ -8,26 +9,26 @@ export function Event_ComponentSkeletonDetail() { - + - +
- +
- - - - - + + + + + - - - + + +
diff --git a/src/app_modules/event/detail/main_detail/index.tsx b/src/app_modules/event/detail/main_detail/index.tsx index 3438ba1a..bbfefbda 100644 --- a/src/app_modules/event/detail/main_detail/index.tsx +++ b/src/app_modules/event/detail/main_detail/index.tsx @@ -4,8 +4,9 @@ import { API_RouteEvent } from "@/app/lib/api_user_router/route_api_event"; import { IRealtimeData } from "@/app/lib/global_state"; import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil"; import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; import notifikasiToUser_funCreate from "@/app_modules/notifikasi/fun/create/create_notif_to_user"; -import { Button, Skeleton, Stack } from "@mantine/core"; +import { Button, Stack } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; import { useState } from "react"; import { WibuRealtime } from "wibu-pkg"; @@ -49,7 +50,7 @@ export default function Event_DetailMain({ /> {isJoinSuccess == null ? ( - + ) : isJoinSuccess ? (