diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cde977b..30560fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. +## [1.2.27](https://github.com/bipproduction/hipmi/compare/v1.2.26...v1.2.27) (2024-12-12) + ## [1.2.26](https://github.com/bipproduction/hipmi/compare/v1.2.25...v1.2.26) (2024-12-12) ## [1.2.25](https://github.com/bipproduction/hipmi/compare/v1.2.24...v1.2.25) (2024-12-12) diff --git a/package.json b/package.json index 5813c14a..f18b9dad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hipmi", - "version": "1.2.26", + "version": "1.2.27", "private": true, "prisma": { "seed": "npx tsx prisma/seed.ts --yes" diff --git a/src/app_modules/_global/component/button_create.tsx b/src/app_modules/_global/component/button_create.tsx index 892cc258..6fa820ab 100644 --- a/src/app_modules/_global/component/button_create.tsx +++ b/src/app_modules/_global/component/button_create.tsx @@ -40,11 +40,15 @@ export default function ComponentGlobal_CreateButton({ router.push(path); }} > - {isLoading ? ( + {/* PAKE LOADING */} + {/* {isLoading ? ( ) : ( - )} + )} */} + + {/* GA PAKE LOADING */} + ); diff --git a/src/app_modules/crowd/main/view.tsx b/src/app_modules/crowd/main/view.tsx index 026d2c06..b3d4787d 100644 --- a/src/app_modules/crowd/main/view.tsx +++ b/src/app_modules/crowd/main/view.tsx @@ -74,11 +74,15 @@ export default function MainCrowd() { - {loadingInv ? ( + {/* PAKE LOADING */} + {/* {loadingInv ? ( ) : ( - )} + )} */} + + {/* GA PAKE LOADING */} + @@ -114,11 +118,15 @@ export default function MainCrowd() { - {loadingDon ? ( + {/* PAKE LOADING */} + {/* {loadingDon ? ( ) : ( - )} + )} */} + + {/* GA PAKE LOADINGF */} + 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 ae9f6cb6..ab84a3a2 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 @@ -1,23 +1,21 @@ "use client"; -import { ComponentGlobal_CardLoadingOverlay, ComponentGlobal_CardStyles, ComponentGlobal_LoadImageCustom, } from "@/app_modules/_global/component"; +import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi"; +import { ComponentGlobal_CardStyles, ComponentGlobal_LoadImageCustom } from "@/app_modules/_global/component"; import { Grid, Progress, Stack, Text } from "@mantine/core"; import { useRouter } from "next/navigation"; -import { useState } from "react"; import ComponentDonasi_TampilanHitungMundur from "../tampilan_hitung_mundur"; import TampilanRupiahDonasi from "../tampilan_rupiah"; -export default function ComponentDonasi_CardPublishNew({ data, path, }: { data: any; path: string; }) { +export default function ComponentDonasi_CardPublishNew({ data }: { data: any; }) { const router = useRouter(); - const [visible, setVisible] = useState(false); - const [donasiId, setDonasiId] = useState(""); return ( <> { - setVisible(true); - setDonasiId(data.id); - router.push(path + `${data.id}`); + // DELSOON + console.log(RouterDonasi.detail_main + `${data.id}`) + router.push(RouterDonasi.detail_main + `${data.id}`) }} > diff --git a/src/app_modules/donasi/main/beranda_new.tsx b/src/app_modules/donasi/main/beranda_new.tsx index 87f9a696..04385702 100644 --- a/src/app_modules/donasi/main/beranda_new.tsx +++ b/src/app_modules/donasi/main/beranda_new.tsx @@ -121,10 +121,7 @@ export default function MainDonasiNew() { }} > {(item) => ( - + )} ) diff --git a/src/app_modules/katalog/profile/_component/button/comp_create_new_profile.tsx b/src/app_modules/katalog/profile/_component/button/comp_create_new_profile.tsx index 104afedf..a8207043 100644 --- a/src/app_modules/katalog/profile/_component/button/comp_create_new_profile.tsx +++ b/src/app_modules/katalog/profile/_component/button/comp_create_new_profile.tsx @@ -19,12 +19,16 @@ import { MODEL_PROFILE } from "../../model/interface"; export function Profile_ComponentCreateNewProfile({ value, - filePP, - fileBG, + // filePP, + // fileBG, + fotoProfileId, + backgroundProfileId, }: { value: MODEL_PROFILE; - filePP: File; - fileBG: File; + // filePP: File; + // fileBG: File; + fotoProfileId: string; + backgroundProfileId: string; }) { const router = useRouter(); const [loading, setLoading] = useState(false); @@ -41,9 +45,9 @@ export function Profile_ComponentCreateNewProfile({ if (!newData.email.match(gmailRegex)) return ComponentGlobal_NotifikasiPeringatan("Format email salah"); - if (filePP == null) + if (fotoProfileId == "") return ComponentGlobal_NotifikasiPeringatan("Lengkapi foto profile"); - if (fileBG == null) + if (backgroundProfileId == null) return ComponentGlobal_NotifikasiPeringatan( "Lengkapi background profile" ); @@ -51,28 +55,28 @@ export function Profile_ComponentCreateNewProfile({ try { setLoading(true); - const uploadPhoto = await funGlobal_UploadToStorage({ - file: filePP, - dirId: DIRECTORY_ID.profile_foto, - }); - if (!uploadPhoto.success) { - ComponentGlobal_NotifikasiPeringatan("Gagal upload foto profile"); - return; - } + // const uploadPhoto = await funGlobal_UploadToStorage({ + // file: filePP, + // dirId: DIRECTORY_ID.profile_foto, + // }); + // if (!uploadPhoto.success) { + // ComponentGlobal_NotifikasiPeringatan("Gagal upload foto profile"); + // return; + // } - const uploadBackground = await funGlobal_UploadToStorage({ - file: fileBG, - dirId: DIRECTORY_ID.profile_background, - }); - if (!uploadBackground.success) { - ComponentGlobal_NotifikasiPeringatan("Gagal upload background profile"); - return; - } + // const uploadBackground = await funGlobal_UploadToStorage({ + // file: fileBG, + // dirId: DIRECTORY_ID.profile_background, + // }); + // if (!uploadBackground.success) { + // ComponentGlobal_NotifikasiPeringatan("Gagal upload background profile"); + // return; + // } const create = await funCreateNewProfile({ data: newData as any, - imageId: uploadPhoto.data.id, - imageBackgroundId: uploadBackground.data.id, + imageId: fotoProfileId, + imageBackgroundId: backgroundProfileId, }); if (create.status === 201) { diff --git a/src/app_modules/katalog/profile/create/view.tsx b/src/app_modules/katalog/profile/create/view.tsx index 1c3a1578..77f2c180 100644 --- a/src/app_modules/katalog/profile/create/view.tsx +++ b/src/app_modules/katalog/profile/create/view.tsx @@ -1,12 +1,15 @@ "use client"; +import { DIRECTORY_ID } from "@/app/lib"; import { MainColor } from "@/app_modules/_global/color"; import { ComponentGlobal_BoxInformation, ComponentGlobal_BoxUploadImage, ComponentGlobal_ErrorInput, } from "@/app_modules/_global/component"; +import { funGlobal_UploadToStorage } from "@/app_modules/_global/fun"; import { MAX_SIZE } from "@/app_modules/_global/lib"; +import { PemberitahuanMaksimalFile } from "@/app_modules/_global/lib/max_size"; import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global"; import { AspectRatio, @@ -26,13 +29,14 @@ import { IconAt, IconCamera, IconUpload } from "@tabler/icons-react"; import { useState } from "react"; import { gmailRegex } from "../../component/regular_expressions"; import { Profile_ComponentCreateNewProfile } from "../_component"; -import { PemberitahuanMaksimalFile } from "@/app_modules/_global/lib/max_size"; export default function CreateProfile() { const [filePP, setFilePP] = useState(null); const [imgPP, setImgPP] = useState(); const [fileBG, setFileBG] = useState(null); const [imgBG, setImgBG] = useState(); + const [fotoProfileId, setFotoProfileId] = useState(""); + const [backgroundProfileId, setBackgroundProfileId] = useState(""); const [value, setValue] = useState({ name: "", @@ -92,8 +96,20 @@ export default function CreateProfile() { PemberitahuanMaksimalFile ); } else { - setImgPP(buffer); - setFilePP(files); + const uploadPhoto = await funGlobal_UploadToStorage({ + file: files, + dirId: DIRECTORY_ID.profile_foto, + }); + + if (uploadPhoto.success) { + setFotoProfileId(uploadPhoto.data.id); + setImgPP(buffer); + setFilePP(files); + } else { + ComponentGlobal_NotifikasiPeringatan( + "Gagal upload foto profile" + ); + } } } catch (error) { console.log(error); @@ -154,8 +170,20 @@ export default function CreateProfile() { PemberitahuanMaksimalFile ); } else { - setImgBG(buffer); - setFileBG(files); + const uploadBackground = await funGlobal_UploadToStorage({ + file: files, + dirId: DIRECTORY_ID.profile_background, + }); + + if (uploadBackground.success) { + setBackgroundProfileId(uploadBackground.data.id); + setImgBG(buffer); + setFileBG(files); + } else { + ComponentGlobal_NotifikasiPeringatan( + "Gagal upload background profile" + ); + } } } catch (error) { console.log(error); @@ -256,8 +284,10 @@ export default function CreateProfile() {