From 84b1339fb010137a40f5a53db2d589c003f6256e Mon Sep 17 00:00:00 2001 From: Bagasbanuna02 Date: Wed, 12 Mar 2025 15:15:55 +0800 Subject: [PATCH] fix ui event --- .gitignore | 3 +- src/app/dev/event/main/layout.tsx | 15 +- src/app/zCoba/home/v2_view.tsx | 32 +- .../component/new/component_header.tsx | 3 +- .../_global/ui/ui_header_tamplate.tsx | 18 +- .../_global/ui/ui_layout_tamplate.tsx | 8 +- src/app_modules/event/_ui/konfirmasi.tsx | 572 +++++++++--------- .../event/component/detail/detail_data.tsx | 10 +- .../event/component/new_footer.tsx | 75 +++ src/app_modules/event/create/layout.tsx | 18 +- src/app_modules/event/detail/draft/layout.tsx | 30 +- .../event/detail/kontribusi/layout.tsx | 18 +- .../event/detail/main_detail/layout.tsx | 18 +- .../event/detail/peserta/layout.tsx | 21 +- .../event/detail/publish/layout.tsx | 18 +- src/app_modules/event/detail/reject/index.tsx | 55 +- .../event/detail/reject/layout.tsx | 18 +- .../event/detail/review/layout.tsx | 18 +- .../event/detail/riwayat/layout.tsx | 16 +- src/app_modules/event/edit/layout.tsx | 18 +- .../event/main/new_layout_event.tsx | 31 + .../job/main/beranda/view_beranda.tsx | 13 +- 22 files changed, 648 insertions(+), 380 deletions(-) create mode 100644 src/app_modules/event/component/new_footer.tsx create mode 100644 src/app_modules/event/main/new_layout_event.tsx diff --git a/.gitignore b/.gitignore index 68b2dd30..98970e2d 100644 --- a/.gitignore +++ b/.gitignore @@ -64,4 +64,5 @@ certificates/ *.swo *.swn .DS_Store -Thumbs.db \ No newline at end of file +Thumbs.db +.qodo diff --git a/src/app/dev/event/main/layout.tsx b/src/app/dev/event/main/layout.tsx index f7a4ce5d..3f595b15 100644 --- a/src/app/dev/event/main/layout.tsx +++ b/src/app/dev/event/main/layout.tsx @@ -1,8 +1,15 @@ import { LayoutEvent_Main } from "@/app_modules/event"; +import NewLayout_Event from "@/app_modules/event/main/new_layout_event"; import React from "react"; -export default async function Layout({children}:{children: React.ReactNode}) { - return<> - {children} +export default async function Layout({ + children, +}: { + children: React.ReactNode; +}) { + return ( + <> + {children} -} \ No newline at end of file + ); +} diff --git a/src/app/zCoba/home/v2_view.tsx b/src/app/zCoba/home/v2_view.tsx index 67717a6f..34b8933f 100644 --- a/src/app/zCoba/home/v2_view.tsx +++ b/src/app/zCoba/home/v2_view.tsx @@ -3,6 +3,7 @@ import { Badge, + Box, Button, Card, Group, @@ -26,10 +27,16 @@ export default function ViewV2() { Aplikasi dengan layout yang dioptimalkan untuk tampilan mobile - {[...Array(5)].map((_, index) => ( - + + + {[...Array(5)].map((_, index) => ( + + Test + + ))} + + + {[...Array(5)].map((_, index) => ( +
+ Test +
+ ))} - ); diff --git a/src/app_modules/_global/component/new/component_header.tsx b/src/app_modules/_global/component/new/component_header.tsx index 2f0be7a3..bb2fd0af 100644 --- a/src/app_modules/_global/component/new/component_header.tsx +++ b/src/app_modules/_global/component/new/component_header.tsx @@ -1,3 +1,5 @@ +"use client" + import { ActionIcon, Box, Group, Title, Loader } from "@mantine/core"; import { useRouter } from "next/navigation"; import { useState } from "react"; @@ -41,7 +43,6 @@ export function Component_Header({ w={"100%"} h={"100%"} position={posotion ? posotion : "apart"} - px={"md"} > {hideButtonLeft ? ( diff --git a/src/app_modules/_global/ui/ui_header_tamplate.tsx b/src/app_modules/_global/ui/ui_header_tamplate.tsx index 5b76731c..36c6fc23 100644 --- a/src/app_modules/_global/ui/ui_header_tamplate.tsx +++ b/src/app_modules/_global/ui/ui_header_tamplate.tsx @@ -49,12 +49,11 @@ export default function UIGlobal_LayoutHeaderTamplate({ <> )} */} - {/* GA PAKE LOADING SAAT KLIK BACK */} - {iconLeft ? ( - iconLeft - ) : ( - - )} + {iconLeft ? iconLeft : } )} diff --git a/src/app_modules/_global/ui/ui_layout_tamplate.tsx b/src/app_modules/_global/ui/ui_layout_tamplate.tsx index 393a8f25..201a93fa 100644 --- a/src/app_modules/_global/ui/ui_layout_tamplate.tsx +++ b/src/app_modules/_global/ui/ui_layout_tamplate.tsx @@ -32,17 +32,17 @@ export default function UIGlobal_LayoutTamplate({ }} > - + > */} {children} - + {/* */} @@ -78,7 +78,7 @@ export function UIChildren({ return ( <> - + {children} diff --git a/src/app_modules/event/_ui/konfirmasi.tsx b/src/app_modules/event/_ui/konfirmasi.tsx index 7b913106..3e42f2b6 100644 --- a/src/app_modules/event/_ui/konfirmasi.tsx +++ b/src/app_modules/event/_ui/konfirmasi.tsx @@ -1,28 +1,30 @@ "use client"; -import { API_RouteEvent } from "@/lib/api_user_router/route_api_event"; -import { RouterEvent } from "@/lib/router_hipmi/router_event"; import { MainColor } from "@/app_modules/_global/color"; import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component"; import { ComponentGlobal_NotifikasiBerhasil, ComponentGlobal_NotifikasiGagal, } from "@/app_modules/_global/notif_global"; -import { UIGlobal_LayoutDefault } from "@/app_modules/_global/ui"; +import UI_NewLayoutTamplate, { + UI_NewChildren, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; +import { API_RouteEvent } from "@/lib/api_user_router/route_api_event"; +import { RouterEvent } from "@/lib/router_hipmi/router_event"; +import { clientLogger } from "@/util/clientLogger"; import { Button, Center, Group, Skeleton, Stack, Text } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; import { useAtom } from "jotai"; import moment from "moment"; +import "moment/locale/id"; import { useParams, useRouter } from "next/navigation"; import { useState } from "react"; +import { apiGetEventDetailById } from "../_lib/api_event"; +import { MODEL_EVENT } from "../_lib/interface"; import { event_funUpdateKehadiran } from "../fun"; import { Event_funJoinAndConfirmEvent } from "../fun/create/fun_join_and_confirm"; -import { gs_event_hotMenu } from "../global_state"; -import { MODEL_EVENT } from "../_lib/interface"; import { Event_funJoinEvent } from "../fun/create/fun_join_event"; -import "moment/locale/id"; -import { apiGetEventDetailById } from "../_lib/api_event"; -import { clientLogger } from "@/util/clientLogger"; +import { gs_event_hotMenu } from "../global_state"; export default function Ui_Konfirmasi({ userLoginId, @@ -83,15 +85,17 @@ export default function Ui_Konfirmasi({ const data = await res.json(); setIsPresent(data); } + + console.log("Peserta >", isPresent) // =========== CEK KEHADIRAN ===========// // Jika data kosong - if (data == null && isPresent == null) { + if (!data && !isPresent) { return ; } // Jika data tidak ada - if (data == null) { + if (!data) { return ( <> @@ -173,32 +177,34 @@ function DataNotFound() { return ( <> - - - - - - Data Event Tidak Ditemukan - + + + + + + + Data Event Tidak Ditemukan + - - - - - + + + + + + ); } @@ -206,20 +212,22 @@ function DataNotFound() { function SkeletonIsDataNull() { return ( <> - - - - - {" "} - {" "} - -
- -
- - - - + + + + + + {" "} + {" "} + +
+ +
+ + + + + ); } @@ -231,41 +239,44 @@ function UserJoinTrue({ title, tanggal }: { title: string; tanggal: Date }) { return ( <> - - - - - - Terima kasih, Bapak/Ibu, Anda telah berhasil bergabung dalam - acara{" "} - - {title} - {" "} - . Mohon ditunggu hingga tanggal{" "} - - {moment(tanggal).format("DD-MM-YYYY")} - {" "} - untuk melakukan konfirmasi kehadiran melalui aplikasi HIPMI APP. - + + + + + + + Terima kasih, Bapak/Ibu, Anda telah berhasil bergabung dalam + acara{" "} + + {title} + {" "} + . Mohon ditunggu hingga tanggal{" "} + + {moment(tanggal).format("DD-MM-YYYY")} + {" "} + untuk melakukan konfirmasi kehadiran melalui aplikasi HIPMI + APP. + - - - - - + + + + + + ); } @@ -306,50 +317,52 @@ function UserAllowToJoin({ return ( <> - - - - - - Halo, Bapak/Ibu. Kami dengan senang hati mengundang Anda untuk - bergabung dalam acara - - {title} - {" "} - yang akan diselenggarakan pada{" "} - - {moment(tanggal).format("LL")} - {" "} - pukul - - {moment(tanggal).format("LT")} - {" "} - di - - {lokasi} - {" "} - . Pastikan Anda sudah melakukan registrasi melalui aplikasi - [Nama Aplikasi] agar dapat berpartisipasi. Kami sangat - menantikan kehadiran Anda. Sampai jumpa di acara ini. - + + + + + + + Halo, Bapak/Ibu. Kami dengan senang hati mengundang Anda untuk + bergabung dalam acara + + {title} + {" "} + yang akan diselenggarakan pada{" "} + + {moment(tanggal).format("LL")} + {" "} + pukul + + {moment(tanggal).format("LT")} + {" "} + di + + {lokasi} + {" "} + . Pastikan Anda sudah melakukan registrasi melalui aplikasi + [Nama Aplikasi] agar dapat berpartisipasi. Kami sangat + menantikan kehadiran Anda. Sampai jumpa di acara ini. + - - - - - + + + + + + ); } @@ -385,42 +398,45 @@ function UserNotJoinAndEventReady({ } return ( <> - - - - - - Halo, Bapak/Ibu. Kami mencatat bahwa Anda belum melakukan - registrasi melalui aplikasi untuk mengikuti acara{" "} - - {title}. - {" "} - Mohon segera lakukan registrasi melalui Event App agar dapat - mengikuti acara ini. Jika membutuhkan bantuan, jangan ragu untuk - menghubungi tim kami. Terima kasih Terima kasih atas kehadiran - Anda di acara pada hari ini. Mohon untuk mengonfirmasi kehadiran - Anda dengan menekan tombol {"Join & Konfirmasi"} - atau fitur konfirmasi yang tersedia di bawah. Terima kasih dan - selamat menikmati acara. - + + + + + + + Halo, Bapak/Ibu. Kami mencatat bahwa Anda belum melakukan + registrasi melalui aplikasi untuk mengikuti acara{" "} + + {title}. + {" "} + Mohon segera lakukan registrasi melalui Event App agar dapat + mengikuti acara ini. Jika membutuhkan bantuan, jangan ragu + untuk menghubungi tim kami. Terima kasih Terima kasih atas + kehadiran Anda di acara pada hari ini. Mohon untuk + mengonfirmasi kehadiran Anda dengan menekan tombol{" "} + {"Join & Konfirmasi"} + atau fitur konfirmasi yang tersedia di bawah. Terima kasih dan + selamat menikmati acara. + - - - - - + + + + + + ); } @@ -439,56 +455,58 @@ function EventAlreadyDone({ return ( <> - - - - - - Kami mohon maaf, Bapak/Ibu, acara{" "} - - {title} - {" "} - telah selesai, sehingga konfirmasi kehadiran sudah tidak dapat - dilakukan. Terima kasih atas perhatian dan minat Anda. Kami - berharap dapat bertemu di acara kami berikutnya. Terima kasih, - Bapak/Ibu, kehadiran Anda di acara. - - - - + + + + + + + Kami mohon maaf, Bapak/Ibu, acara{" "} + + {title} + {" "} + telah selesai, sehingga konfirmasi kehadiran sudah tidak dapat + dilakukan. Terima kasih atas perhatian dan minat Anda. Kami + berharap dapat bertemu di acara kami berikutnya. Terima kasih, + Bapak/Ibu, kehadiran Anda di acara. + + + + - - - - - + + + + + + ); } @@ -521,41 +539,43 @@ function UserNotConfirm({ } return ( <> - - - - - - Terima kasih atas kehadiran Anda di acara{" "} - - {title} - {" "} - pada hari ini. Mohon untuk mengonfirmasi kehadiran Anda dengan - menekan tombol{" "} - - Konfirmasi Kehadiran - {" "} - atau fitur konfirmasi yang tersedia di bawah. Terima kasih dan - selamat menikmati acara. - + + + + + + + Terima kasih atas kehadiran Anda di acara{" "} + + {title} + {" "} + pada hari ini. Mohon untuk mengonfirmasi kehadiran Anda dengan + menekan tombol{" "} + + Konfirmasi Kehadiran + {" "} + atau fitur konfirmasi yang tersedia di bawah. Terima kasih dan + selamat menikmati acara. + - - - - - + + + + + + ); } @@ -567,38 +587,40 @@ function UserAlreadyConfirm({ title }: { title: string }) { return ( <> - - - - - - Terima kasih, Bapak/Ibu, kehadiran Anda di acara{" "} - - {title} - {" "} - telah berhasil dikonfirmasi. Kami senang menyambut Anda dan - semoga acara ini memberikan manfaat yang maksimal. Selamat - mengikuti kegiatan. - + + + + + + + Terima kasih, Bapak/Ibu, kehadiran Anda di acara{" "} + + {title} + {" "} + telah berhasil dikonfirmasi. Kami senang menyambut Anda dan + semoga acara ini memberikan manfaat yang maksimal. Selamat + mengikuti kegiatan. + - - - - - + + + + + + ); } diff --git a/src/app_modules/event/component/detail/detail_data.tsx b/src/app_modules/event/component/detail/detail_data.tsx index 1878fb42..58d98f1a 100644 --- a/src/app_modules/event/component/detail/detail_data.tsx +++ b/src/app_modules/event/component/detail/detail_data.tsx @@ -14,13 +14,12 @@ import Event_ComponentBoxDaftarSponsor from "./comp_box_sponsor"; export default function ComponentEvent_DetailData({ isDaftarPeserta, isReport, - data + data, }: { isDaftarPeserta?: boolean; isReport?: boolean; - data: MODEL_EVENT | null + data: MODEL_EVENT | null; }) { - return ( <> {!data ? ( @@ -28,7 +27,10 @@ export default function ComponentEvent_DetailData({ ) : ( {isReport && ( - + )} diff --git a/src/app_modules/event/component/new_footer.tsx b/src/app_modules/event/component/new_footer.tsx new file mode 100644 index 00000000..c7c22130 --- /dev/null +++ b/src/app_modules/event/component/new_footer.tsx @@ -0,0 +1,75 @@ +import { RouterEvent } from "@/lib/router_hipmi/router_event"; +import { + IconHome, + IconReservedLine, + IconCalendarEvent, + IconHistory, +} from "@tabler/icons-react"; +import { useAtom } from "jotai"; +import { useRouter } from "next/navigation"; +import { gs_event_hotMenu } from "../global_state"; +import { MainColor } from "@/app_modules/_global/color"; +import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global"; +import { SimpleGrid, Stack, ActionIcon, Text } from "@mantine/core"; + +export function Event_ComponentNewFooter() { + const router = useRouter(); + const [hotMenu, setHotMenu] = useAtom(gs_event_hotMenu); + + const listFooter = [ + { + id: "1", + name: "Beranda", + path: RouterEvent.beranda, + icon: , + }, + + { + id: "2", + name: "Status", + path: RouterEvent.status({ id: "1" }), + icon: , + }, + { + id: "3", + name: "Kontribusi", + path: RouterEvent.kontribusi, + icon: , + }, + { + id: "4", + name: "Riwayat", + path: RouterEvent.riwayat({ id: "1" }), + icon: , + }, + ]; + return ( + <> + + {listFooter.map((e, i) => ( + + + e.path === "" + ? ComponentGlobal_NotifikasiPeringatan("Cooming Soon") + : (router.replace(e.path), setHotMenu(i)) + } + > + {e.icon} + + + {e.name} + + + ))} + + + ); +} diff --git a/src/app_modules/event/create/layout.tsx b/src/app_modules/event/create/layout.tsx index 00e6048b..2f802ee0 100644 --- a/src/app_modules/event/create/layout.tsx +++ b/src/app_modules/event/create/layout.tsx @@ -1,7 +1,10 @@ "use client"; -import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import React from "react"; export default function LayoutEvent_Create({ @@ -11,9 +14,16 @@ export default function LayoutEvent_Create({ }) { return ( <> - }> + {/* }> {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/event/detail/draft/layout.tsx b/src/app_modules/event/detail/draft/layout.tsx index fc5d3f71..4d820e11 100644 --- a/src/app_modules/event/detail/draft/layout.tsx +++ b/src/app_modules/event/detail/draft/layout.tsx @@ -1,9 +1,12 @@ "use client"; -import { RouterEvent } from "@/lib/router_hipmi/router_event"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; import UIGlobal_Drawer from "@/app_modules/_global/ui/ui_drawer"; -import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; +import { RouterEvent } from "@/lib/router_hipmi/router_event"; import { ActionIcon } from "@mantine/core"; import { IconDotsVertical, IconEdit } from "@tabler/icons-react"; import { useRouter } from "next/navigation"; @@ -30,7 +33,24 @@ export default function LayoutEvent_DetailDraft({ return ( <> - + + setOpenDrawer(true)} + > + + + } + /> + + {children} + + + {/* {children} - + */} - } > {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/event/detail/main_detail/layout.tsx b/src/app_modules/event/detail/main_detail/layout.tsx index 465b92a1..34d990f3 100644 --- a/src/app_modules/event/detail/main_detail/layout.tsx +++ b/src/app_modules/event/detail/main_detail/layout.tsx @@ -1,7 +1,11 @@ "use client"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import React from "react"; export default function LayoutEvent_DetailMain({ @@ -11,11 +15,13 @@ export default function LayoutEvent_DetailMain({ }) { return ( <> - } - > - {children} - + + + + + {children} + ); } diff --git a/src/app_modules/event/detail/peserta/layout.tsx b/src/app_modules/event/detail/peserta/layout.tsx index 903a55d2..5d0a80bb 100644 --- a/src/app_modules/event/detail/peserta/layout.tsx +++ b/src/app_modules/event/detail/peserta/layout.tsx @@ -1,12 +1,23 @@ -import { UIGlobal_LayoutHeaderTamplate, UIGlobal_LayoutTamplate } from '@/app_modules/_global/ui'; -import React from 'react'; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; +import React from "react"; -function LayoutEvent_Peserta({children}: {children: React.ReactNode}) { +function LayoutEvent_Peserta({ children }: { children: React.ReactNode }) { return ( <> - }> + {/* }> {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/event/detail/publish/layout.tsx b/src/app_modules/event/detail/publish/layout.tsx index 35c78baa..627bcb05 100644 --- a/src/app_modules/event/detail/publish/layout.tsx +++ b/src/app_modules/event/detail/publish/layout.tsx @@ -1,7 +1,10 @@ "use client"; -import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import React from "react"; export default function LayoutEvent_DetailPublish({ @@ -11,11 +14,18 @@ export default function LayoutEvent_DetailPublish({ }) { return ( <> - } > {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/event/detail/reject/index.tsx b/src/app_modules/event/detail/reject/index.tsx index 6e3c8e89..b67558ef 100644 --- a/src/app_modules/event/detail/reject/index.tsx +++ b/src/app_modules/event/detail/reject/index.tsx @@ -4,43 +4,42 @@ import { AccentColor, MainColor } from "@/app_modules/_global/color"; import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil"; import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal"; import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; import { RouterEvent } from "@/lib/router_hipmi/router_event"; import { clientLogger } from "@/util/clientLogger"; import { Button, Group, SimpleGrid, Stack } from "@mantine/core"; +import { useShallowEffect } from "@mantine/hooks"; import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime"; import { useParams, useRouter } from "next/navigation"; import { useState } from "react"; +import { apiGetEventDetailById } from "../../_lib/api_event"; +import { MODEL_EVENT } from "../../_lib/interface"; import ComponentEvent_DetailData from "../../component/detail/detail_data"; import { Event_funDeleteById } from "../../fun/delete/fun_delete"; import { Event_funEditStatusById } from "../../fun/edit/fun_edit_status_by_id"; -import { useShallowEffect } from "@mantine/hooks"; -import { apiGetEventDetailById } from "../../_lib/api_event"; -import { MODEL_EVENT } from "../../_lib/interface"; -import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; export default function Event_DetailReject() { - const params = useParams<{ id: string }>(); - const eventId = params.id as string; - const [data, setData] = useState(null); + const params = useParams<{ id: string }>(); + const eventId = params.id as string; + const [data, setData] = useState(null); - useShallowEffect(() => { - onLoadData(); - }, []); + useShallowEffect(() => { + onLoadData(); + }, []); - async function onLoadData() { - try { - const respone = await apiGetEventDetailById({ - id: eventId, - }); - - if (respone) { - setData(respone.data); - } - } catch (error) { - clientLogger.error("Error get data detail event", error); - } - } + async function onLoadData() { + try { + const respone = await apiGetEventDetailById({ + id: eventId, + }); + if (respone) { + setData(respone.data); + } + } catch (error) { + clientLogger.error("Error get data detail event", error); + } + } return ( <> @@ -52,7 +51,13 @@ export default function Event_DetailReject() { ); } -function ButtonAction({ eventId, data }: { eventId: string , data: MODEL_EVENT | null}) { +function ButtonAction({ + eventId, + data, +}: { + eventId: string; + data: MODEL_EVENT | null; +}) { const router = useRouter(); const [openModal1, setOpenModal1] = useState(false); const [openModal2, setOpenModal2] = useState(false); @@ -134,6 +139,8 @@ function ButtonAction({ eventId, data }: { eventId: string , data: MODEL_EVENT | )} + + {/* MODAL EDIT */} - } > {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/event/detail/review/layout.tsx b/src/app_modules/event/detail/review/layout.tsx index 28480947..8109caaa 100644 --- a/src/app_modules/event/detail/review/layout.tsx +++ b/src/app_modules/event/detail/review/layout.tsx @@ -1,7 +1,10 @@ "use client"; -import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import React from "react"; export default function LayoutEvent_DetailReview({ @@ -11,11 +14,18 @@ export default function LayoutEvent_DetailReview({ }) { return ( <> - } > {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/event/detail/riwayat/layout.tsx b/src/app_modules/event/detail/riwayat/layout.tsx index 33acd340..f17e78a2 100644 --- a/src/app_modules/event/detail/riwayat/layout.tsx +++ b/src/app_modules/event/detail/riwayat/layout.tsx @@ -1,9 +1,8 @@ "use client"; -import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { UI_NewChildren, UI_NewHeader } from "@/app_modules/_global/ui/V2_layout_tamplate"; import React from "react"; - export default function LayoutEvent_DetailRiwayat({ children, }: { @@ -11,9 +10,16 @@ export default function LayoutEvent_DetailRiwayat({ }) { return ( <> - }> + {/* }> {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/event/edit/layout.tsx b/src/app_modules/event/edit/layout.tsx index fbe4d4f7..82b474eb 100644 --- a/src/app_modules/event/edit/layout.tsx +++ b/src/app_modules/event/edit/layout.tsx @@ -1,7 +1,10 @@ "use client"; -import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate"; -import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; import React from "react"; export default function LayoutEvent_Edit({ @@ -11,9 +14,16 @@ export default function LayoutEvent_Edit({ }) { return ( <> - }> + {/* }> {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/event/main/new_layout_event.tsx b/src/app_modules/event/main/new_layout_event.tsx new file mode 100644 index 00000000..fa546fc5 --- /dev/null +++ b/src/app_modules/event/main/new_layout_event.tsx @@ -0,0 +1,31 @@ +"use client"; + +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { + UI_NewChildren, + UI_NewFooter, + UI_NewHeader, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; +import { RouterHome } from "@/lib/router_hipmi/router_home"; +import React from "react"; +import { Event_ComponentNewFooter } from "../component/new_footer"; + +export default function NewLayout_Event({ + children, +}: { + children: React.ReactNode; +}) { + return ( + <> + + + + + {children} + + + + + + ); +} diff --git a/src/app_modules/job/main/beranda/view_beranda.tsx b/src/app_modules/job/main/beranda/view_beranda.tsx index edda6ea4..0198f402 100644 --- a/src/app_modules/job/main/beranda/view_beranda.tsx +++ b/src/app_modules/job/main/beranda/view_beranda.tsx @@ -1,12 +1,13 @@ "use client"; -import { gs_jobTiggerBeranda } from "@/lib/global_state"; -import { RouterJob } from "@/lib/router_hipmi/router_job"; import ComponentGlobal_CreateButton from "@/app_modules/_global/component/button_create"; import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data"; -import { ActionIcon, Box, Center, Loader, Stack, TextInput } from "@mantine/core"; +import { gs_jobTiggerBeranda } from "@/lib/global_state"; +import { RouterJob } from "@/lib/router_hipmi/router_job"; +import { clientLogger } from "@/util/clientLogger"; +import { Box, Center, Loader, Stack, TextInput } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; -import { IconPlus, IconSearch } from "@tabler/icons-react"; +import { IconSearch } from "@tabler/icons-react"; import { useAtom } from "jotai"; import _ from "lodash"; import { ScrollOnly } from "next-scroll-loader"; @@ -15,11 +16,9 @@ import { Job_ComponentButtonUpdateBeranda, Job_ComponentSkeletonBeranda, } from "../../component"; +import { apiGetJob } from "../../component/api_fetch_job"; import ComponentJob_BerandaCardView from "../../component/beranda/card_view"; import { MODEL_JOB } from "../../model/interface"; -import { apiGetJob } from "../../component/api_fetch_job"; -import { clientLogger } from "@/util/clientLogger"; -import Component_NewCreateButton from "@/app_modules/_global/component/new/new_button_create"; export default function Job_ViewBeranda() { const [data, setData] = useState([]);