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 ? (
@@ -180,22 +182,29 @@ export default function BodyHome() {
{menuHomeJob.icon}
-
+
{menuHomeJob.name}
{loadingJob ? (
- Array(2)
+ Array(1)
.fill(null)
.map((_, i) => (
-
-
-
+
+
+
+
+
+
+
+
+
+
))
) : _.isEmpty(dataJob) ? (
@@ -206,7 +215,7 @@ export default function BodyHome() {
-
+
{e?.Author.username}
-
+
{e?.title}
diff --git a/src/app_modules/home/component/footer_home.tsx b/src/app_modules/home/component/footer_home.tsx
index 9fe2d9a1..7699a86e 100644
--- a/src/app_modules/home/component/footer_home.tsx
+++ b/src/app_modules/home/component/footer_home.tsx
@@ -16,6 +16,7 @@ import { useState } from "react";
import { apiGetDataHome } from "../fun/get/api_home";
import { Home_ComponentAvatarProfile } from "./comp_avatar_profile";
import { listMenuHomeFooter } from "./list_menu_home";
+import { MainColor } from "@/app_modules/_global/color";
export default function FooterHome() {
const router = useRouter();
@@ -74,12 +75,12 @@ export default function FooterHome() {
>
{e.icon}
-
+
{e.name}
@@ -105,7 +106,7 @@ export default function FooterHome() {
>
{dataUser.profile === undefined || dataUser?.profile === null ? (
-
+
) : (
)}
-
+
Profile
diff --git a/src/app_modules/home/view_home_new.tsx b/src/app_modules/home/view_home_new.tsx
index bd5cc8cc..67980668 100644
--- a/src/app_modules/home/view_home_new.tsx
+++ b/src/app_modules/home/view_home_new.tsx
@@ -79,7 +79,7 @@ export default function HomeViewNew() {
}
}}
>
-
+
}
customButtonRight={
@@ -113,10 +113,10 @@ export default function HomeViewNew() {
}
>
-
+
) : (
-
+
)}
}
diff --git a/src/app_modules/investasi/_component/comp_card_border_and_background.tsx b/src/app_modules/investasi/_component/comp_card_border_and_background.tsx
index a6942af2..28c496b0 100644
--- a/src/app_modules/investasi/_component/comp_card_border_and_background.tsx
+++ b/src/app_modules/investasi/_component/comp_card_border_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";
@@ -26,7 +26,7 @@ export function Investasi_ComponentStylesCard({
paddingInline: "15px",
paddingBlock: "15px",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
marginBottom: marginBottom ? marginBottom : "0x",
}}
onClick={onClickHandler}
diff --git a/src/app_modules/investasi/_component/detail/comp_box_daftar_berita.tsx b/src/app_modules/investasi/_component/detail/comp_box_daftar_berita.tsx
index 84919ace..9ad879b3 100644
--- a/src/app_modules/investasi/_component/detail/comp_box_daftar_berita.tsx
+++ b/src/app_modules/investasi/_component/detail/comp_box_daftar_berita.tsx
@@ -2,7 +2,7 @@ import {
NEW_RouterInvestasi,
RouterInvestasi_OLD,
} from "@/app/lib/router_hipmi/router_investasi";
-import { AccentColor } from "@/app_modules/_global/color";
+import { AccentColor, MainColor } from "@/app_modules/_global/color";
import { ActionIcon, Flex, Loader, Paper, Text } from "@mantine/core";
import { IconFileDescription } from "@tabler/icons-react";
import { useRouter } from "next/navigation";
@@ -34,12 +34,12 @@ export function Investasi_ComponentBoxDaftarBerita({
}}
>
- Berita
+ Berita
{isLoading ? (
) : (
-
+
)}
diff --git a/src/app_modules/investasi/_component/detail/comp_box_daftar_dokumen.tsx b/src/app_modules/investasi/_component/detail/comp_box_daftar_dokumen.tsx
index a422ac7c..b930f4e1 100644
--- a/src/app_modules/investasi/_component/detail/comp_box_daftar_dokumen.tsx
+++ b/src/app_modules/investasi/_component/detail/comp_box_daftar_dokumen.tsx
@@ -2,7 +2,7 @@ import {
NEW_RouterInvestasi,
RouterInvestasi_OLD,
} from "@/app/lib/router_hipmi/router_investasi";
-import { AccentColor } from "@/app_modules/_global/color";
+import { AccentColor, MainColor } from "@/app_modules/_global/color";
import { ActionIcon, Flex, Loader, Paper, Text } from "@mantine/core";
import { IconFileDescription } from "@tabler/icons-react";
import { useRouter } from "next/navigation";
@@ -35,12 +35,12 @@ export function Investasi_ComponentBoxDaftarDokumen({
}}
>
- Dokumen
+ Dokumen
{isLoading ? (
) : (
-
+
)}
diff --git a/src/app_modules/investasi/_component/detail/comp_box_prospektus.tsx b/src/app_modules/investasi/_component/detail/comp_box_prospektus.tsx
index 1af7d87e..8c94af37 100644
--- a/src/app_modules/investasi/_component/detail/comp_box_prospektus.tsx
+++ b/src/app_modules/investasi/_component/detail/comp_box_prospektus.tsx
@@ -1,5 +1,5 @@
import { NEW_RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi";
-import { AccentColor } from "@/app_modules/_global/color";
+import { AccentColor, MainColor } from "@/app_modules/_global/color";
import { ActionIcon, Flex, Loader, Paper, Text } from "@mantine/core";
import { IconBookDownload } from "@tabler/icons-react";
import { useRouter } from "next/navigation";
@@ -32,12 +32,12 @@ export function Investasi_ComponentBoxProspektus({
}}
>
- Prospektus
+ Prospektus
{isLoading ? (
) : (
-
+
)}
diff --git a/src/app_modules/investasi/_component/detail/comp_title_and_value_in_detail.tsx b/src/app_modules/investasi/_component/detail/comp_title_and_value_in_detail.tsx
index 3f8ca614..84e93f58 100644
--- a/src/app_modules/investasi/_component/detail/comp_title_and_value_in_detail.tsx
+++ b/src/app_modules/investasi/_component/detail/comp_title_and_value_in_detail.tsx
@@ -1,3 +1,4 @@
+import { MainColor } from "@/app_modules/_global/color";
import { Grid, Text } from "@mantine/core";
import { data } from "autoprefixer";
import React from "react";
@@ -13,7 +14,7 @@ export function Investasi_ComponentTitleAndValueInDetail({
<>
- {title}
+ {title}
:
{value}
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 7457c457..5df62a04 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
@@ -15,6 +15,7 @@ import {
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";
export function Investasi_ComponentBoxDetailData({
data,
@@ -31,7 +32,7 @@ export function Investasi_ComponentBoxDetailData({
-
+
{data?.Investasi.title}
diff --git a/src/app_modules/investasi/_component/detail/saham_saya/comp_harga_dan_lembar.tsx b/src/app_modules/investasi/_component/detail/saham_saya/comp_harga_dan_lembar.tsx
index 5effc7a5..91a5d44f 100644
--- a/src/app_modules/investasi/_component/detail/saham_saya/comp_harga_dan_lembar.tsx
+++ b/src/app_modules/investasi/_component/detail/saham_saya/comp_harga_dan_lembar.tsx
@@ -6,6 +6,7 @@ import { Stack, Grid, Text } from "@mantine/core";
import { data } from "autoprefixer";
import { Investasi_ComponentStylesCard } from "../../comp_card_border_and_background";
import { MODEL_INVOICE_INVESTASI } from "@/app_modules/investasi/_lib/interface";
+import { MainColor } from "@/app_modules/_global/color";
export function Investasi_ComponentBoxHargaDanLembarSaham({
data,
@@ -19,7 +20,7 @@ export function Investasi_ComponentBoxHargaDanLembarSaham({
- Transaksi Saham
+ Transaksi Saham
- Saham Terbeli
+ Saham Terbeli
- Progres Saham
+ Progres Saham
diff --git a/src/app_modules/investasi/_component/main/comp_card_daftar_transaksi_new.tsx b/src/app_modules/investasi/_component/main/comp_card_daftar_transaksi_new.tsx
index 0ada112b..70b0ae09 100644
--- a/src/app_modules/investasi/_component/main/comp_card_daftar_transaksi_new.tsx
+++ b/src/app_modules/investasi/_component/main/comp_card_daftar_transaksi_new.tsx
@@ -1,5 +1,5 @@
import { NEW_RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi";
-import { AccentColor } from "@/app_modules/_global/color/color_pallet";
+import { AccentColor, MainColor } from "@/app_modules/_global/color/color_pallet";
import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global/notifikasi_peringatan";
import { Card, Group, Stack, Text, Title } from "@mantine/core";
import { useRouter } from "next/navigation";
@@ -48,7 +48,7 @@ export function Investasi_ComponentCardDaftarTransaksiNew({ data }: { data: IDat
backgroundColor: AccentColor.darkblue,
border: `2px solid ${AccentColor.blue}`,
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
}}
mb={"md"}
onClick={() =>
diff --git a/src/app_modules/investasi/_component/main/comp_card_saham_saya_new.tsx b/src/app_modules/investasi/_component/main/comp_card_saham_saya_new.tsx
index bfaee9d9..9e4a7f7a 100644
--- a/src/app_modules/investasi/_component/main/comp_card_saham_saya_new.tsx
+++ b/src/app_modules/investasi/_component/main/comp_card_saham_saya_new.tsx
@@ -27,12 +27,12 @@ export function Investasi_ComponentSahamSayaNew({ data }: { data: IDataSahamSaya
@@ -51,7 +51,7 @@ export function Investasi_ComponentSahamSayaNew({ data }: { data: IDataSahamSaya
backgroundColor: MainColor.yellow,
},
root: {
- backgroundColor: "whitesmoke",
+ backgroundColor: MainColor.white,
},
label: {
color: "black",
diff --git a/src/app_modules/investasi/_ui/detail/ui_detail_main.tsx b/src/app_modules/investasi/_ui/detail/ui_detail_main.tsx
index 94bfc7b1..c8e7d345 100644
--- a/src/app_modules/investasi/_ui/detail/ui_detail_main.tsx
+++ b/src/app_modules/investasi/_ui/detail/ui_detail_main.tsx
@@ -16,6 +16,7 @@ import {
RouterInvestasi_OLD,
} from "@/app/lib/router_hipmi/router_investasi";
import { IconDeviceIpadPlus } from "@tabler/icons-react";
+import { MainColor } from "@/app_modules/_global/color";
export function Investasi_UiDetailMain({
dataInvestasi,
@@ -54,7 +55,7 @@ export function Investasi_UiDetailMain({
variant="transparent"
onClick={() => setOpenDrawer(true)}
>
-
+
) : (
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 aae4d214..1399f467 100644
--- a/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx
+++ b/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx
@@ -23,6 +23,7 @@ import {
Investasi_ViewDetailReview,
} from "../../_view";
import ComponentGlobal_Loader from "@/app_modules/_global/component/loader";
+import { MainColor } from "@/app_modules/_global/color";
export function Investasi_UiDetailPortofolio({
dataInvestasi,
@@ -69,7 +70,7 @@ export function Investasi_UiDetailPortofolio({
variant="transparent"
onClick={() => setOpenDrawer(true)}
>
-
+
}
/>
@@ -93,7 +94,7 @@ export function Investasi_UiDetailPortofolio({
{
setPageId(e?.id);
setLoading(true);
@@ -109,7 +110,7 @@ export function Investasi_UiDetailPortofolio({
e?.icon
)}
-
+
{e?.name}
diff --git a/src/app_modules/investasi/_ui/main/ui_portofolio_new.tsx b/src/app_modules/investasi/_ui/main/ui_portofolio_new.tsx
index 05b97ad2..aabae637 100644
--- a/src/app_modules/investasi/_ui/main/ui_portofolio_new.tsx
+++ b/src/app_modules/investasi/_ui/main/ui_portofolio_new.tsx
@@ -61,7 +61,7 @@ export function Investasi_UiPortofolioNew() {
transition: "ease 0.5s ",
backgroundColor:
param.id === e.id ? MainColor.yellow : AccentColor.blue,
- color: param.id === e.id ? "black" : "white",
+ color: param.id === e.id ? "black" : MainColor.white,
}}
>
{e.name}
diff --git a/src/app_modules/investasi/_view/detail/portofolio/view_detail_publish.tsx b/src/app_modules/investasi/_view/detail/portofolio/view_detail_publish.tsx
index e13258de..c06d20cc 100644
--- a/src/app_modules/investasi/_view/detail/portofolio/view_detail_publish.tsx
+++ b/src/app_modules/investasi/_view/detail/portofolio/view_detail_publish.tsx
@@ -80,7 +80,7 @@ export default function Investasi_ViewDetailPublish({
{/* Title dan Persentase */}
-
+
{_.startCase(data.title)}
@@ -90,12 +90,12 @@ export default function Investasi_ViewDetailPublish({
{data.Investasi_Invoice.length} }
+ value={{data.Investasi_Invoice.length} }
/>
+
Rp.{" "}
{new Intl.NumberFormat("id-ID", {
maximumSignificantDigits: 20,
@@ -107,7 +107,7 @@ export default function Investasi_ViewDetailPublish({
+
Rp.{" "}
{new Intl.NumberFormat("id-ID", {
maximumSignificantDigits: 10,
@@ -117,14 +117,14 @@ export default function Investasi_ViewDetailPublish({
/>
Return Of Invesment (RoI)}
- value={{data.roi} %}
+ title={Return Of Invesment (RoI)}
+ value={{data.roi} %}
/>
+
{new Intl.NumberFormat("id-ID", {
maximumSignificantDigits: 10,
}).format(+data.totalLembar)}{" "}
@@ -136,7 +136,7 @@ export default function Investasi_ViewDetailPublish({
+
{new Intl.NumberFormat("id-ID", {
maximumSignificantDigits: 10,
}).format(+data.sisaLembar)}{" "}
@@ -147,15 +147,15 @@ export default function Investasi_ViewDetailPublish({
{data.MasterPembagianDeviden.name} Bulan }
+ value={{data.MasterPembagianDeviden.name} Bulan }
/>
{data.MasterPeriodeDeviden.name}}
+ value={{data.MasterPeriodeDeviden.name}}
/>
{data.MasterPencarianInvestor.name} Hari }
+ value={{data.MasterPencarianInvestor.name} Hari }
/>
diff --git a/src/app_modules/investasi/_view/main/portofolio/skeleton_portofolio.tsx b/src/app_modules/investasi/_view/main/portofolio/skeleton_portofolio.tsx
index 8fc3463b..1d834c21 100644
--- a/src/app_modules/investasi/_view/main/portofolio/skeleton_portofolio.tsx
+++ b/src/app_modules/investasi/_view/main/portofolio/skeleton_portofolio.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 SkeletonInvestasiPortofolio() {
return (
@@ -13,7 +14,7 @@ export default function SkeletonInvestasiPortofolio() {
-
+
@@ -21,7 +22,7 @@ export default function SkeletonInvestasiPortofolio() {
-
+
diff --git a/src/app_modules/investasi/_view/main/skeleton_saham_saya.tsx b/src/app_modules/investasi/_view/main/skeleton_saham_saya.tsx
index 1aada275..2334fe63 100644
--- a/src/app_modules/investasi/_view/main/skeleton_saham_saya.tsx
+++ b/src/app_modules/investasi/_view/main/skeleton_saham_saya.tsx
@@ -1,5 +1,6 @@
import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component";
-import { Grid, Skeleton } from "@mantine/core";
+import CustomSkeleton from "@/app_modules/components/CustomSkeleton";
+import { Grid } from "@mantine/core";
export default function SkeletonInvestasiSahamSaya() {
return (
@@ -8,7 +9,7 @@ export default function SkeletonInvestasiSahamSaya() {
-
+
diff --git a/src/app_modules/investasi/_view/status_transaksi/view_invoice_berhasil.tsx b/src/app_modules/investasi/_view/status_transaksi/view_invoice_berhasil.tsx
index 87317b8a..0b3a9fcf 100644
--- a/src/app_modules/investasi/_view/status_transaksi/view_invoice_berhasil.tsx
+++ b/src/app_modules/investasi/_view/status_transaksi/view_invoice_berhasil.tsx
@@ -1,6 +1,6 @@
"use client";
-import { AccentColor } from "@/app_modules/_global/color/color_pallet";
+import { AccentColor, MainColor } from "@/app_modules/_global/color/color_pallet";
import {
ComponentGlobal_LoadImage,
ComponentGlobal_TampilanRupiah,
@@ -44,7 +44,7 @@ export function Investasi_ViewTransaksiBerhasil({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
}}
>
@@ -61,7 +61,7 @@ export function Investasi_ViewTransaksiBerhasil({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
marginBottom: "15px",
}}
>
diff --git a/src/app_modules/investasi/_view/transaksi/view_invoice.tsx b/src/app_modules/investasi/_view/transaksi/view_invoice.tsx
index ac6855c7..22b21722 100644
--- a/src/app_modules/investasi/_view/transaksi/view_invoice.tsx
+++ b/src/app_modules/investasi/_view/transaksi/view_invoice.tsx
@@ -110,7 +110,7 @@ export function Investasi_ViewInvoice({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
}}
>
Mohon transfer ke rekening dibawah
@@ -123,7 +123,7 @@ export function Investasi_ViewInvoice({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
marginBottom: "15px",
}}
>
@@ -181,7 +181,7 @@ export function Investasi_ViewInvoice({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
marginBottom: "15px",
}}
>
@@ -196,7 +196,7 @@ export function Investasi_ViewInvoice({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
}}
>
@@ -272,7 +272,7 @@ export function Investasi_ViewInvoice({
{file ? (
-
+
Upload berhasil{" "}
@@ -280,7 +280,7 @@ export function Investasi_ViewInvoice({
) : (
-
+
Upload bukti transfer anda !
diff --git a/src/app_modules/investasi/_view/transaksi/view_metode_pembayaran.tsx b/src/app_modules/investasi/_view/transaksi/view_metode_pembayaran.tsx
index eabb3f3d..ba719598 100644
--- a/src/app_modules/investasi/_view/transaksi/view_metode_pembayaran.tsx
+++ b/src/app_modules/investasi/_view/transaksi/view_metode_pembayaran.tsx
@@ -101,19 +101,19 @@ export function Investasi_ViewMetodePembayaran({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
marginBottom: "15px",
}}
>
+
{e.namaBank}
}
diff --git a/src/app_modules/investasi/_view/transaksi/view_proses_pembelian.tsx b/src/app_modules/investasi/_view/transaksi/view_proses_pembelian.tsx
index c84522bb..78aae922 100644
--- a/src/app_modules/investasi/_view/transaksi/view_proses_pembelian.tsx
+++ b/src/app_modules/investasi/_view/transaksi/view_proses_pembelian.tsx
@@ -52,8 +52,8 @@ export function Investasi_ViewProsesPembelian({
>
{/* Sisa Lembar Saham */}
- Sisa Lembar Saham
-
+ Sisa Lembar Saham
+
{new Intl.NumberFormat("id-ID", {
maximumFractionDigits: 10,
}).format(+data.sisaLembar)}{" "}
@@ -62,8 +62,8 @@ export function Investasi_ViewProsesPembelian({
{/* Harga perlembar saham */}
- Harga Perlembar
-
+ Harga Perlembar
+
Rp.{" "}
{new Intl.NumberFormat("id-ID", {
maximumFractionDigits: 10,
@@ -74,12 +74,13 @@ export function Investasi_ViewProsesPembelian({
{/* Lembar saham */}
- Jumlah Pembelian
+ Jumlah Pembelian
minimal pembelian 10 lembar
-
+
- Total Harga
+ Total Harga
-
+
Rp.{" "}
{new Intl.NumberFormat("id-ID", {
maximumFractionDigits: 10,
diff --git a/src/app_modules/investasi/_view/transaksi/view_proses_transaksi.tsx b/src/app_modules/investasi/_view/transaksi/view_proses_transaksi.tsx
index 267cea6d..6d8882f6 100644
--- a/src/app_modules/investasi/_view/transaksi/view_proses_transaksi.tsx
+++ b/src/app_modules/investasi/_view/transaksi/view_proses_transaksi.tsx
@@ -30,7 +30,7 @@ export function Investasi_ViewProsesTransaksi({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
}}
>
@@ -41,13 +41,13 @@ export function Investasi_ViewProsesTransaksi({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
}}
>
Admin sedang memproses transaksimu
-
+
@@ -73,7 +73,7 @@ export function Investasi_ViewProsesTransaksi({
padding: "15px",
cursor: "pointer",
borderRadius: "10px",
- color: "white",
+ color: MainColor.white,
}}
>
@@ -94,7 +94,7 @@ export function Investasi_ViewProsesTransaksi({
target="_blank"
href={`https://wa.me/+${nomorAdmin.nomor}?text=Hallo Admin , Saya ada kendala dalam proses transfer investasi !`}
>
-
+
diff --git a/src/app_modules/investasi/component/detail/card_status.tsx b/src/app_modules/investasi/component/detail/card_status.tsx
index 85b79514..2fc26c32 100644
--- a/src/app_modules/investasi/component/detail/card_status.tsx
+++ b/src/app_modules/investasi/component/detail/card_status.tsx
@@ -3,7 +3,7 @@ import { Paper, Grid, Stack, AspectRatio, Text, Image } from "@mantine/core";
import _ from "lodash";
import { MODEL_INVESTASI } from "../../_lib/interface";
-import { AccentColor } from "@/app_modules/_global/color/color_pallet";
+import { AccentColor, MainColor } from "@/app_modules/_global/color/color_pallet";
import { useRouter } from "next/navigation";
export function ComponentInvestasi_CardStatus({
@@ -23,7 +23,7 @@ export function ComponentInvestasi_CardStatus({
backgroundColor: AccentColor.darkblue,
borderRadius: "10px",
border: `2px solid ${AccentColor.blue}`,
- color: "white",
+ color: MainColor.white,
marginBottom: "15px",
}}
>
diff --git a/src/app_modules/investasi/create/view_new.tsx b/src/app_modules/investasi/create/view_new.tsx
index 98ae33be..ce1e4921 100644
--- a/src/app_modules/investasi/create/view_new.tsx
+++ b/src/app_modules/investasi/create/view_new.tsx
@@ -276,8 +276,14 @@ export default function InvestasiCreateNew() {
Rp.}
min={0}
@@ -331,8 +343,14 @@ export default function InvestasiCreateNew() {
Rp.}
min={0}
@@ -378,16 +396,28 @@ export default function InvestasiCreateNew() {
readOnly
styles={{
label: {
- color: "white",
+ color: MainColor.white,
},
+ required: {
+ color: MainColor.red,
+ },
+ input: {
+ backgroundColor: MainColor.white,
+ }
}}
/>
@@ -409,8 +439,14 @@ export default function InvestasiCreateNew() {
@@ -195,7 +196,7 @@ function BoxIsAuthor({
{/* Arsip button */}
{
onSetDrawer({
drawer: false,
@@ -206,7 +207,7 @@ function BoxIsAuthor({
>
-
+
Update Arsip
diff --git a/src/app_modules/vote/component/detail/detail_data_sebelum_publish.tsx b/src/app_modules/vote/component/detail/detail_data_sebelum_publish.tsx
index 476c2888..da48b86d 100644
--- a/src/app_modules/vote/component/detail/detail_data_sebelum_publish.tsx
+++ b/src/app_modules/vote/component/detail/detail_data_sebelum_publish.tsx
@@ -10,7 +10,7 @@ import {
} from "@mantine/core";
import { IconCircle } from "@tabler/icons-react";
import { MODEL_VOTING } from "../../model/interface";
-import { AccentColor } from "@/app_modules/_global/color/color_pallet";
+import { AccentColor, MainColor } from "@/app_modules/_global/color/color_pallet";
export default function ComponentVote_DetailDataSebelumPublish
({
@@ -26,7 +26,7 @@ export default function ComponentVote_DetailDataSebelumPublish
backgroundColor: AccentColor.darkblue,
borderRadius: "10px",
border: `2px solid ${AccentColor.blue}`,
- color: "white",
+ color: MainColor.white,
}}
>
@@ -49,7 +49,7 @@ export default function ComponentVote_DetailDataSebelumPublish
root: {
backgroundColor: AccentColor.blue,
border: `1px solid ${AccentColor.skyblue}`,
- color: "white",
+ color: MainColor.white,
width: "80%",
},
}}
diff --git a/src/app_modules/vote/component/detail/detail_data_setelah_publish.tsx b/src/app_modules/vote/component/detail/detail_data_setelah_publish.tsx
index a78d5d47..d7f222c3 100644
--- a/src/app_modules/vote/component/detail/detail_data_setelah_publish.tsx
+++ b/src/app_modules/vote/component/detail/detail_data_setelah_publish.tsx
@@ -1,5 +1,5 @@
"use client";
-import { AccentColor } from "@/app_modules/_global/color/color_pallet";
+import { AccentColor, MainColor } from "@/app_modules/_global/color/color_pallet";
import {
ComponentGlobal_AvatarAndUsername,
ComponentGlobal_CardStyles,
@@ -43,7 +43,7 @@ export default function ComponentVote_DetailDataSetelahPublish({
root: {
backgroundColor: AccentColor.blue,
border: `1px solid ${AccentColor.skyblue}`,
- color: "white",
+ color: MainColor.white,
width: "80%",
},
}}
diff --git a/src/app_modules/vote/component/detail/detail_hasil_voting.tsx b/src/app_modules/vote/component/detail/detail_hasil_voting.tsx
index 61a872b6..53963913 100644
--- a/src/app_modules/vote/component/detail/detail_hasil_voting.tsx
+++ b/src/app_modules/vote/component/detail/detail_hasil_voting.tsx
@@ -1,6 +1,6 @@
"use client";
-import { AccentColor } from "@/app_modules/_global/color/color_pallet";
+import { AccentColor, MainColor } from "@/app_modules/_global/color/color_pallet";
import {
Avatar,
Card,
@@ -25,7 +25,7 @@ export default function ComponentVote_HasilVoting({
backgroundColor: AccentColor.darkblue,
borderRadius: "10px",
border: `2px solid ${AccentColor.blue}`,
- color: "white",
+ color: MainColor.white,
}}
>
diff --git a/src/app_modules/vote/component/skeleton_view.tsx b/src/app_modules/vote/component/skeleton_view.tsx
index 21baff8c..5496b500 100644
--- a/src/app_modules/vote/component/skeleton_view.tsx
+++ b/src/app_modules/vote/component/skeleton_view.tsx
@@ -1,5 +1,6 @@
import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component";
-import { Center, Grid, Group, Skeleton, Stack } from "@mantine/core";
+import CustomSkeleton from "@/app_modules/components/CustomSkeleton";
+import { Center, Grid, Group, Stack } from "@mantine/core";
export {
Voting_ComponentSkeletonDetail,
@@ -17,25 +18,25 @@ function Voting_ComponentSkeletonViewPublish() {
-
+
-
+
-
-
- {/* */}
+
+
+ {/* */}
{Array.from({ length: 2 }).map((e, i) => (
-
-
+
+
))}
@@ -53,8 +54,8 @@ function Voting_ComponentSkeletonViewStatus() {
{Array.from({ length: 2 }).map((e, i) => (
-
-
+
+
))}
@@ -70,31 +71,31 @@ function Voting_ComponentSkeletonViewKontribusi() {
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -111,30 +112,30 @@ function Voting_ComponentSkeletonDetail() {
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
{/*
-
-
-
+
+
+
*/}
-
+
@@ -142,17 +143,17 @@ function Voting_ComponentSkeletonDetail() {
-
+
-
-
+
+
-
-
+
+
@@ -169,13 +170,13 @@ function Voting_ComponentSkeletonDaftarKontributor(){
-
+
-
+
-
+
diff --git a/src/app_modules/vote/main/beranda.tsx b/src/app_modules/vote/main/beranda.tsx
index a0d8e193..069e9d1c 100644
--- a/src/app_modules/vote/main/beranda.tsx
+++ b/src/app_modules/vote/main/beranda.tsx
@@ -2,7 +2,7 @@
import { gs_votingTiggerBeranda } from "@/app/lib/global_state";
import { RouterVote } from "@/app/lib/router_hipmi/router_vote";
-import { AccentColor } from "@/app_modules/_global/color";
+import { AccentColor, MainColor } from "@/app_modules/_global/color";
import ComponentGlobal_CreateButton from "@/app_modules/_global/component/button_create";
import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data";
import { clientLogger } from "@/util/clientLogger";
@@ -119,6 +119,7 @@ export default function Vote_Beranda() {
radius={"xl"}
placeholder="Masukan judul voting"
onChange={(val) => onSearch(val.target.value)}
+ styles={{ input: { backgroundColor: MainColor.white } }}
/>
diff --git a/src/app_modules/vote/main/layout.tsx b/src/app_modules/vote/main/layout.tsx
index fb31f83b..2f82295c 100644
--- a/src/app_modules/vote/main/layout.tsx
+++ b/src/app_modules/vote/main/layout.tsx
@@ -70,7 +70,7 @@ export default function LayoutVote_Main({
e.path === ""
? ComponentGlobal_NotifikasiPeringatan("Cooming Soon")
diff --git a/src/app_modules/vote/main/riwayat/index.tsx b/src/app_modules/vote/main/riwayat/index.tsx
index 8231546b..6ac85b19 100644
--- a/src/app_modules/vote/main/riwayat/index.tsx
+++ b/src/app_modules/vote/main/riwayat/index.tsx
@@ -60,11 +60,11 @@ export default function Vote_Riwayat() {
style={{
transition: "0.5s",
backgroundColor:
- params.id === e.id ? MainColor.yellow : "white",
+ params.id === e.id ? MainColor.yellow : MainColor.white,
border:
params.id === e.id
? `1px solid ${AccentColor.yellow}`
- : `1px solid white`,
+ : `1px solid ${MainColor.white}`,
}}
>
{e.label}
diff --git a/src/app_modules/vote/main/status/draft.tsx b/src/app_modules/vote/main/status/draft.tsx
index 7d0ab754..be70dbb6 100644
--- a/src/app_modules/vote/main/status/draft.tsx
+++ b/src/app_modules/vote/main/status/draft.tsx
@@ -69,7 +69,7 @@ export default function Vote_StatusDraft() {
{(item) => (
)}
diff --git a/src/app_modules/vote/main/status/index.tsx b/src/app_modules/vote/main/status/index.tsx
index 11a59a44..9d464d4a 100644
--- a/src/app_modules/vote/main/status/index.tsx
+++ b/src/app_modules/vote/main/status/index.tsx
@@ -68,7 +68,7 @@ export default function Vote_Status() {
style={{
transition: "0.5s",
backgroundColor:
- params.id === e.id ? MainColor.yellow : "white",
+ params.id === e.id ? MainColor.yellow : MainColor.white,
border:
params.id === e.id
? `1px solid ${AccentColor.yellow}`
diff --git a/src/app_modules/vote/main/status/reject.tsx b/src/app_modules/vote/main/status/reject.tsx
index c66f902c..1db98190 100644
--- a/src/app_modules/vote/main/status/reject.tsx
+++ b/src/app_modules/vote/main/status/reject.tsx
@@ -69,7 +69,7 @@ export default function Vote_StatusReject() {
{(item) => (
)}