From 122ffe5d2d0309eec2a2721b61cfcc773577b436 Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 23 Dec 2024 10:14:42 +0800 Subject: [PATCH 1/4] fix: edit banner Deskripsi: - warna icon pada tombol edit banner No Issues --- src/module/banner/ui/list_banner.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/module/banner/ui/list_banner.tsx b/src/module/banner/ui/list_banner.tsx index 8497475..eaee1a7 100644 --- a/src/module/banner/ui/list_banner.tsx +++ b/src/module/banner/ui/list_banner.tsx @@ -151,7 +151,7 @@ function ListBanner() { > router.push(`/banner/edit/${idData}`)} direction="column" align="center" justify="center" pb={20}> - + Edit From bce9135119a4b421d5d22656fa6fdc90b9c1d6e2 Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 23 Dec 2024 10:24:23 +0800 Subject: [PATCH 2/4] upd: grup Deskripsi: - penamaan grup diganti dengan darmasaba - *blm di page lain No Issues --- src/module/group/ui/drawer_group.tsx | 12 ++++++------ src/module/group/ui/edit_drawer_group.tsx | 14 +++++++------- src/module/group/ui/navbar_group.tsx | 2 +- src/module/home/ui/view_detail_feature.tsx | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/module/group/ui/drawer_group.tsx b/src/module/group/ui/drawer_group.tsx index b53a39d..dd1b54d 100644 --- a/src/module/group/ui/drawer_group.tsx +++ b/src/module/group/ui/drawer_group.tsx @@ -33,7 +33,7 @@ export default function DrawerGroup({ onSuccess, }: { onSuccess: (val: boolean) } catch (error) { console.error(error); - toast.error("Gagal menambahkan grup, coba lagi nanti"); + toast.error("Gagal menambahkan data, coba lagi nanti"); } finally { setLoading(false) } @@ -78,7 +78,7 @@ export default function DrawerGroup({ onSuccess, }: { onSuccess: (val: boolean) - Tambah Grup + Tambah Darmasaba @@ -86,7 +86,7 @@ export default function DrawerGroup({ onSuccess, }: { onSuccess: (val: boolean) setOpenDrawerGroup(false)} - title={"Tambah Grup"} + title={"Tambah Darmasaba"} > { onValidation('name', e.target.value) }} error={ touched.name && - (namaGroup == "" ? "Grup Tidak Boleh Kosong" : + (namaGroup == "" ? "Tidak Boleh Kosong" : namaGroup.length < 3 ? "Masukkan Minimal 3 karakter" : "" ) } diff --git a/src/module/group/ui/edit_drawer_group.tsx b/src/module/group/ui/edit_drawer_group.tsx index f5c7e48..92ce626 100644 --- a/src/module/group/ui/edit_drawer_group.tsx +++ b/src/module/group/ui/edit_drawer_group.tsx @@ -33,7 +33,7 @@ export default function EditDrawerGroup({ onUpdated, id, isActive, }: { onUpdate } catch (error) { console.error(error); - toast.error("Gagal mendapatkan grup, coba lagi nanti"); + toast.error("Gagal mendapatkan data, coba lagi nanti"); } } @@ -57,7 +57,7 @@ export default function EditDrawerGroup({ onUpdated, id, isActive, }: { onUpdate } } catch (error) { console.error(error); - toast.error("Edit grup gagal, coba lagi nanti"); + toast.error("Edit data gagal, coba lagi nanti"); } finally { setLoading(false); } @@ -95,7 +95,7 @@ export default function EditDrawerGroup({ onUpdated, id, isActive, }: { onUpdate } } catch (error) { console.error(error); - toast.error("Edit grup gagal, coba lagi nanti"); + toast.error("Edit data gagal, coba lagi nanti"); } finally { setLoadingModal(false) setModal(false); @@ -139,7 +139,7 @@ export default function EditDrawerGroup({ onUpdated, id, isActive, }: { onUpdate setOpenDrawerGroup(false)} - title={"Edit Grup"} + title={"Edit Darmasaba"} > diff --git a/src/module/group/ui/navbar_group.tsx b/src/module/group/ui/navbar_group.tsx index aa3d765..5cdea6a 100644 --- a/src/module/group/ui/navbar_group.tsx +++ b/src/module/group/ui/navbar_group.tsx @@ -11,7 +11,7 @@ export default function NavbarGroup() { const tema = useHookstate(TEMA) return ( <> - setOpen(true)} variant="light" bg={tema.get().bgIcon} size="lg" radius="lg" aria-label="Settings"> diff --git a/src/module/home/ui/view_detail_feature.tsx b/src/module/home/ui/view_detail_feature.tsx index 57b1cc1..509fe98 100644 --- a/src/module/home/ui/view_detail_feature.tsx +++ b/src/module/home/ui/view_detail_feature.tsx @@ -120,7 +120,7 @@ export default function ViewDetailFeature() {
- Grup + Darmasaba
router.push('/color-palette')}> From b66fb4a629f6e01bd5423aac18a5a8011f4985bf Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 23 Dec 2024 10:47:51 +0800 Subject: [PATCH 3/4] fix: api Deskripsi: - update api yang pake filter idgrup, ketika idgrup='' No Issues --- src/app/api/division/route.ts | 2 +- src/app/api/position/route.ts | 2 +- src/app/api/project/route.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/api/division/route.ts b/src/app/api/division/route.ts index 44b61a4..855b32e 100644 --- a/src/app/api/division/route.ts +++ b/src/app/api/division/route.ts @@ -23,7 +23,7 @@ export async function GET(request: Request) { const active = searchParams.get("active"); const dataSkip = Number(page) * 10 - 10; - if (idGroup == "null" || idGroup == undefined) { + if (idGroup == "null" || idGroup == undefined || idGroup == "") { grup = user.idGroup } else { grup = idGroup diff --git a/src/app/api/position/route.ts b/src/app/api/position/route.ts index 4d12dfa..1f4723d 100644 --- a/src/app/api/position/route.ts +++ b/src/app/api/position/route.ts @@ -19,7 +19,7 @@ export async function GET(request: Request) { return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 }); } - if (idGroup == "null" || idGroup == undefined) { + if (idGroup == "null" || idGroup == undefined || idGroup == "") { grup = user.idGroup } else { grup = idGroup diff --git a/src/app/api/project/route.ts b/src/app/api/project/route.ts index be6eb0e..a0632ed 100644 --- a/src/app/api/project/route.ts +++ b/src/app/api/project/route.ts @@ -24,7 +24,7 @@ export async function GET(request: Request) { const villageId = user.idVillage const userId = user.id - if (idGroup == "null" || idGroup == undefined) { + if (idGroup == "null" || idGroup == undefined || idGroup == "") { grup = user.idGroup } else { grup = idGroup From 0a7de91c0eac18aa6f96b0e6194b0e0cba247d3f Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 23 Dec 2024 10:48:59 +0800 Subject: [PATCH 4/4] upd: api Deskripsi: - update version app No Issues --- src/app/api/version-app/route.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/api/version-app/route.ts b/src/app/api/version-app/route.ts index 5e62079..7425aee 100644 --- a/src/app/api/version-app/route.ts +++ b/src/app/api/version-app/route.ts @@ -2,7 +2,7 @@ import { NextResponse } from "next/server"; export async function GET(request: Request) { try { - return NextResponse.json({ success: true, version: "0.2.5", mode: "staging" }, { status: 200 }); + return NextResponse.json({ success: true, version: "0.2.6", tahap: "beta" }, { status: 200 }); } catch (error) { console.error(error); return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });