diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx new file mode 100644 index 00000000..20e8729b --- /dev/null +++ b/src/app/admin/layout.tsx @@ -0,0 +1 @@ +#! apa \ No newline at end of file diff --git a/src/app/dev/admin/event/main/page.tsx b/src/app/dev/admin/event/main/page.tsx index 92ce6bd0..fb3ab068 100644 --- a/src/app/dev/admin/event/main/page.tsx +++ b/src/app/dev/admin/event/main/page.tsx @@ -1,11 +1,14 @@ import { AdminEvent_Main } from "@/app_modules/admin/event"; import AdminEvent_funCountByStatusId from "@/app_modules/admin/event/fun/count/fun_count_event_by_status_id"; +import { AdminEvent_funCountTipeAcara } from "@/app_modules/admin/event/fun/count/fun_count_tipe_acara"; export default async function Page() { const countPublish = await AdminEvent_funCountByStatusId("1"); const countReview = await AdminEvent_funCountByStatusId("2"); const countDraft = await AdminEvent_funCountByStatusId("3"); const countReject = await AdminEvent_funCountByStatusId("4"); + const countTipeAcara = await AdminEvent_funCountTipeAcara() + return ( <> @@ -14,6 +17,7 @@ export default async function Page() { countReview={countReview as number} countDraft={countDraft as number} countReject={countReject as number} + countTipeAcara={countTipeAcara as number} /> ); diff --git a/src/app/dev/event/detail/riwayat/[id]/layout.tsx b/src/app/dev/event/detail/riwayat/[id]/layout.tsx new file mode 100644 index 00000000..3d6f81a6 --- /dev/null +++ b/src/app/dev/event/detail/riwayat/[id]/layout.tsx @@ -0,0 +1,14 @@ +import { LayoutEvent_DetailRiwayat } from "@/app_modules/event"; +import React from "react"; + +export default async function Layout({ + children, +}: { + children: React.ReactNode; +}) { + return ( + <> + {children} + + ); +} diff --git a/src/app/dev/event/detail/riwayat/[id]/page.tsx b/src/app/dev/event/detail/riwayat/[id]/page.tsx new file mode 100644 index 00000000..5004dfb7 --- /dev/null +++ b/src/app/dev/event/detail/riwayat/[id]/page.tsx @@ -0,0 +1,24 @@ + +import { Event_DetailRiwayat } from "@/app_modules/event"; +import { Event_countTotalPesertaById } from "@/app_modules/event/fun/count/count_total_peserta_by_id"; +import { Event_CekUserJoinById } from "@/app_modules/event/fun/get/cek_user_join_by_id"; +import { Event_getListPesertaById } from "@/app_modules/event/fun/get/get_list_peserta_by_id"; +import { Event_getOneById } from "@/app_modules/event/fun/get/get_one_by_id"; +import { User_getUserId } from "@/app_modules/fun_global/get_user_token"; + +export default async function Page({ params }: { params: { id: string } }) { + let eventId = params.id; + const dataEvent = await Event_getOneById(eventId); + const listPeserta = await Event_getListPesertaById(eventId); + const totalPeserta = await Event_countTotalPesertaById(eventId); + + return ( + <> + + + ); +} diff --git a/src/app/dev/event/main/history/page.tsx b/src/app/dev/event/main/history/page.tsx deleted file mode 100644 index ab089bc9..00000000 --- a/src/app/dev/event/main/history/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import { Event_History } from "@/app_modules/event"; - -export default async function Page({ params }: { params: { id: string } }) { - let eventId = params.id; - console.log(eventId); - return ; -} diff --git a/src/app/dev/event/main/riwayat/page.tsx b/src/app/dev/event/main/riwayat/page.tsx new file mode 100644 index 00000000..d896ef42 --- /dev/null +++ b/src/app/dev/event/main/riwayat/page.tsx @@ -0,0 +1,19 @@ +import { Event_Riwayat } from "@/app_modules/event"; +import { Event_getListRiwayatSaya } from "@/app_modules/event/fun/get/get_list_riwayat_saya"; +import { Event_getListSemuaRiwayat } from "@/app_modules/event/fun/get/get_list_semua_riwayat"; +import { Event_getOneById } from "@/app_modules/event/fun/get/get_one_by_id"; +import { User_getUserId } from "@/app_modules/fun_global/get_user_token"; + +export default async function Page({ params }: { params: { id: string } }) { + let eventId = params.id; + const authorId = await User_getUserId(); + const dataSemuaRiwayat = await Event_getListSemuaRiwayat(); + const dataRiwayatSaya = await Event_getListRiwayatSaya(authorId); + + return ( + + ); +} diff --git a/src/app/dev/event/main/status_page/page.tsx b/src/app/dev/event/main/status_page/page.tsx index bf584a53..6252c986 100644 --- a/src/app/dev/event/main/status_page/page.tsx +++ b/src/app/dev/event/main/status_page/page.tsx @@ -11,6 +11,7 @@ export default async function Page() { return ( + + + + + + + ); +} + +function DetailTipeAcara(){ + return <> + + disiin tipe nya + +} diff --git a/src/app_modules/admin/event/fun/count/fun_count_event_by_status_id.ts b/src/app_modules/admin/event/fun/count/fun_count_event_by_status_id.ts index 0c263ea3..bcb7c67f 100644 --- a/src/app_modules/admin/event/fun/count/fun_count_event_by_status_id.ts +++ b/src/app_modules/admin/event/fun/count/fun_count_event_by_status_id.ts @@ -12,6 +12,9 @@ export default async function AdminEvent_funCountByStatusId(statusId: string) { const count = await prisma.event.count({ where: { eventMaster_StatusId: "1", + tanggal: { + gte: new Date + } }, }); return count; diff --git a/src/app_modules/admin/event/fun/count/fun_count_tipe_acara.ts b/src/app_modules/admin/event/fun/count/fun_count_tipe_acara.ts new file mode 100644 index 00000000..590dcb98 --- /dev/null +++ b/src/app_modules/admin/event/fun/count/fun_count_tipe_acara.ts @@ -0,0 +1,8 @@ +"use server" + +import prisma from "@/app/lib/prisma" + +export async function AdminEvent_funCountTipeAcara() { + const data = await prisma.eventMaster_TipeAcara.count({}) + return data +} \ No newline at end of file diff --git a/src/app_modules/admin/event/fun/get/get_list_table_by_status_id.ts b/src/app_modules/admin/event/fun/get/get_list_table_by_status_id.ts index 3dc49909..5e04a9a6 100644 --- a/src/app_modules/admin/event/fun/get/get_list_table_by_status_id.ts +++ b/src/app_modules/admin/event/fun/get/get_list_table_by_status_id.ts @@ -6,10 +6,14 @@ export async function AdminEvent_getListTableByStatusId(statudId: string) { if (statudId === "1") { const getPublish = await prisma.event.findMany({ orderBy: { - updatedAt: "desc", + tanggal: "desc", }, where: { eventMaster_StatusId: "1", + tanggal: { + gte: new Date + } + }, select: { id: true, diff --git a/src/app_modules/admin/event/index.tsx b/src/app_modules/admin/event/index.tsx index e2c63ed4..596dca6e 100644 --- a/src/app_modules/admin/event/index.tsx +++ b/src/app_modules/admin/event/index.tsx @@ -2,10 +2,12 @@ import AdminEvent_Main from "./main"; import AdminEvent_TableReview from "./table_status/table_review"; import AdminEvent_TablePublish from "./table_status/table_publish"; import AdminEvent_TableReject from "./table_status/table_reject"; +import AdminEvent_DetailTipeAcara from "./detail/tipe_acara"; export { AdminEvent_Main, AdminEvent_TableReview, AdminEvent_TablePublish, AdminEvent_TableReject, + AdminEvent_DetailTipeAcara, }; diff --git a/src/app_modules/admin/event/main/index.tsx b/src/app_modules/admin/event/main/index.tsx index 77153b82..ca568d5d 100644 --- a/src/app_modules/admin/event/main/index.tsx +++ b/src/app_modules/admin/event/main/index.tsx @@ -18,20 +18,22 @@ import { IconChevronsRight } from "@tabler/icons-react"; import { useRouter } from "next/navigation"; import ComponentAdminGlobal_HeaderTamplate from "../../component/header_tamplate"; - export default function AdminEvent_Main({ countPublish, countReview, countDraft, countReject, + countTipeAcara, }: { countPublish: number; countReview: number; countDraft: number; countReject: number; + countTipeAcara: number; }) { const router = useRouter(); - const listBox = [ + + const listStatus = [ { id: 1, name: "Publish", @@ -61,10 +63,29 @@ export default function AdminEvent_Main({ color: "red", }, ]; + + const listBox2 = [ + { + id: 1, + name: "Riwayat Event", + // jumlah: countPublish, + path: RouterAdminEvent.table_publish, + color: "gray", + }, + { + id: 2, + name: "Kategori", + // jumlah: countPublish, + path: RouterAdminEvent.table_publish, + color: "green", + }, + ]; + return ( <> - + + - {listBox.map((e, i) => ( + {listStatus.map((e, i) => ( ))} + + + + + Tipe Acara + {countTipeAcara} + + router.push("")}> + + + + ); diff --git a/src/app_modules/admin/main_dashboard/index.tsx b/src/app_modules/admin/main_dashboard/index.tsx index 415381b9..01c5716f 100644 --- a/src/app_modules/admin/main_dashboard/index.tsx +++ b/src/app_modules/admin/main_dashboard/index.tsx @@ -1,5 +1,5 @@ import AdminMain from "./main/view"; import AdminLayout from "./main/layout"; -import SplashDashboardAdmin from "./splash"; +import SplashDashboardAdmin from "../splash/splash"; export { AdminMain, AdminLayout, SplashDashboardAdmin }; diff --git a/src/app_modules/admin/main_dashboard/splash.tsx b/src/app_modules/admin/splash/splash.tsx similarity index 100% rename from src/app_modules/admin/main_dashboard/splash.tsx rename to src/app_modules/admin/splash/splash.tsx diff --git a/src/app_modules/donasi/main/notif/notif_page.tsx b/src/app_modules/donasi/main/notif/notif_page.tsx index 87542a88..2aa9922f 100644 --- a/src/app_modules/donasi/main/notif/notif_page.tsx +++ b/src/app_modules/donasi/main/notif/notif_page.tsx @@ -50,16 +50,16 @@ export default function Donasi_NotifPage({ - {e.Donasi_Kabar.title} + {e.Donasi_Kabar?.title} {moment(e.createdAt).format("ll")} - {e.Donasi_Kabar.deskripsi} + {e.Donasi_Kabar?.deskripsi} - onClick(router as any, e.Donasi_Kabar.id, e.id) + onClick(router as any, e.Donasi_Kabar?.id, e.id) } > Buka Kabar diff --git a/src/app_modules/event/component/detail/detail_data.tsx b/src/app_modules/event/component/detail/detail_data.tsx index 099b27c3..be67a372 100644 --- a/src/app_modules/event/component/detail/detail_data.tsx +++ b/src/app_modules/event/component/detail/detail_data.tsx @@ -22,7 +22,7 @@ export default function ComponentEvent_DetailData({ <> - {data ? data.title : null} + {data ? data?.title : null} @@ -31,7 +31,7 @@ export default function ComponentEvent_DetailData({ : - {data ? data.lokasi : null} + {data ? data?.lokasi : null} @@ -42,7 +42,7 @@ export default function ComponentEvent_DetailData({ : - {data ? data.EventMaster_TipeAcara.name : null} + {data ? data.EventMaster_TipeAcara?.name : null} @@ -72,7 +72,7 @@ export default function ComponentEvent_DetailData({ maxHeight={50} showLabel="Lihat banyak" > - {data ? data.deskripsi : null} + {data ? data?.deskripsi : null} diff --git a/src/app_modules/event/create/create.tsx b/src/app_modules/event/create/create.tsx index 4156847f..39f96ae1 100644 --- a/src/app_modules/event/create/create.tsx +++ b/src/app_modules/event/create/create.tsx @@ -25,7 +25,7 @@ import { useAtom } from "jotai"; import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime"; import { useRouter } from "next/navigation"; import { useState } from "react"; -import { gs_event_status } from "../global_state"; +import { gs_event_hotMenu, gs_event_status } from "../global_state"; import { MODEL_DEFAULT_MASTER } from "@/app_modules/model_global/interface"; import { Event_funCreate } from "../fun/create/fun_create"; import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/component_global/notif_global/notifikasi_gagal"; @@ -41,6 +41,8 @@ export default function Event_Create({ const router = useRouter(); const [tabsStatus, setTabsStatus] = useAtom(gs_event_status); const [listTipe, setListTipe] = useState(listTipeAcara); + const [hotMenu, setHotMenu] = useAtom(gs_event_hotMenu); + const [value, setValue] = useState({ title: "", @@ -120,7 +122,7 @@ export default function Event_Create({ @@ -132,12 +134,14 @@ export default function Event_Create({ async function onSave( router: AppRouterInstance, setTabsStatus: any, - value: any + value: any, + setHotMenu: any ) { await Event_funCreate(value).then((res) => { if (res.status === 201) { ComponentGlobal_NotifikasiBerhasil(res.message); setTabsStatus("Review"); + setHotMenu(1) router.push(RouterEvent.status_page); } else { ComponentGlobal_NotifikasiGagal(res.message); diff --git a/src/app_modules/event/detail/riwayat/index.tsx b/src/app_modules/event/detail/riwayat/index.tsx new file mode 100644 index 00000000..e8715392 --- /dev/null +++ b/src/app_modules/event/detail/riwayat/index.tsx @@ -0,0 +1,76 @@ +"use client"; + +import { + Avatar, + Box, + Button, + Center, + Divider, + Grid, + Paper, + Stack, + Text, + Title, +} from "@mantine/core"; +import ComponentEvent_DetailData from "../../component/detail/detail_data"; +import { MODEL_EVENT, MODEL_EVENT_PESERTA } from "../../model/interface"; +import _ from "lodash"; +import { Event_funJoinEvent } from "../../fun/create/fun_join_event"; +import { useState } from "react"; +import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/component_global/notif_global/notifikasi_berhasil"; +import { Event_getListPesertaById } from "../../fun/get/get_list_peserta_by_id"; +import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/component_global/notif_global/notifikasi_gagal"; +import ComponentGlobal_AuthorNameOnHeader from "@/app_modules/component_global/author_name_on_header"; +import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog"; +import ComponentEvent_DetailMainData from "../../component/detail/detail_main"; +import { useRouter } from "next/navigation"; +import { Event_countTotalPesertaById } from "../../fun/count/count_total_peserta_by_id"; +import ComponentEvent_ListPeserta from "../../component/detail/list_peserta"; + +export default function Event_DetailRiwayat({ + dataEvent, + listPeserta, + totalPeserta, +}: { + dataEvent: MODEL_EVENT; + listPeserta: MODEL_EVENT_PESERTA[]; + totalPeserta: number; +}) { + const router = useRouter(); + const [total, setTotal] = useState(totalPeserta); + const [peserta, setPeserta] = useState(listPeserta); + return ( + <> + + + + + + ); +} + +async function onJoin( + userId: string, + eventId: string, + setPeserta: any, + setTotal: any +) { + const body = { + userId: userId, + eventId: eventId, + }; + + await Event_funJoinEvent(body as any).then(async (res) => { + if (res.status === 200) { + await Event_getListPesertaById(eventId).then(async (val) => { + await Event_countTotalPesertaById(eventId).then((ttl) => { + setPeserta(val); + setTotal(ttl); + ComponentGlobal_NotifikasiBerhasil(res.message, 2000); + }); + }); + } else { + ComponentGlobal_NotifikasiGagal(res.message); + } + }); +} diff --git a/src/app_modules/event/detail/riwayat/layout.tsx b/src/app_modules/event/detail/riwayat/layout.tsx new file mode 100644 index 00000000..189f3554 --- /dev/null +++ b/src/app_modules/event/detail/riwayat/layout.tsx @@ -0,0 +1,19 @@ +"use client"; + +import { AppShell } from "@mantine/core"; +import React from "react"; +import ComponentEvent_HeaderTamplate from "../../component/header_tamplate"; + +export default function LayoutEvent_DetailRiwayat({ + children, +}: { + children: React.ReactNode; +}) { + return ( + <> + }> + {children} + + + ); +} diff --git a/src/app_modules/event/fun/get/get_event_by_status_id.ts b/src/app_modules/event/fun/get/get_event_by_status_id.ts index 6c9e316e..3fb432d4 100644 --- a/src/app_modules/event/fun/get/get_event_by_status_id.ts +++ b/src/app_modules/event/fun/get/get_event_by_status_id.ts @@ -5,9 +5,15 @@ import prisma from "@/app/lib/prisma"; export async function Event_getByStatusId(statusId: string, authorId: string) { if (statusId === "1") { const data = await prisma.event.findMany({ + orderBy: { + tanggal: "desc", + }, where: { eventMaster_StatusId: "1", authorId: authorId, + tanggal: { + gte: new Date(), + }, }, select: { id: true, @@ -20,6 +26,9 @@ export async function Event_getByStatusId(statusId: string, authorId: string) { } if (statusId === "2") { const data = await prisma.event.findMany({ + orderBy: { + createdAt: "desc", + }, where: { eventMaster_StatusId: "2", authorId: authorId, diff --git a/src/app_modules/event/fun/get/get_list_riwayat_saya.ts b/src/app_modules/event/fun/get/get_list_riwayat_saya.ts new file mode 100644 index 00000000..ded4f8c1 --- /dev/null +++ b/src/app_modules/event/fun/get/get_list_riwayat_saya.ts @@ -0,0 +1,34 @@ +"use server"; + +import prisma from "@/app/lib/prisma"; +import _ from "lodash"; + +export async function Event_getListRiwayatSaya(authorId: string) { + const data = await prisma.event.findMany({ + orderBy: { + tanggal: "desc", + }, + where: { + authorId: authorId, + eventMaster_StatusId: "1", + tanggal: { + lte: new Date(), + }, + }, + select: { + id: true, + title: true, + tanggal: true, + deskripsi: true, + active: true, + authorId: true, + Author: { + select: { + Profile: true, + }, + }, + }, + }); + + return data; +} diff --git a/src/app_modules/event/fun/get/get_list_semua_riwayat.ts b/src/app_modules/event/fun/get/get_list_semua_riwayat.ts new file mode 100644 index 00000000..c2f56204 --- /dev/null +++ b/src/app_modules/event/fun/get/get_list_semua_riwayat.ts @@ -0,0 +1,33 @@ +"use server"; + +import prisma from "@/app/lib/prisma"; +import _ from "lodash"; + +export async function Event_getListSemuaRiwayat() { + const data = await prisma.event.findMany({ + orderBy: { + tanggal: "desc", + }, + where: { + eventMaster_StatusId: "1", + tanggal: { + lte: new Date(), + }, + }, + select: { + id: true, + title: true, + tanggal: true, + deskripsi: true, + active: true, + authorId: true, + Author: { + select: { + Profile: true, + }, + }, + }, + }); + + return data; +} diff --git a/src/app_modules/event/global_state/index.ts b/src/app_modules/event/global_state/index.ts index d78fedbc..952831e3 100644 --- a/src/app_modules/event/global_state/index.ts +++ b/src/app_modules/event/global_state/index.ts @@ -6,4 +6,5 @@ export const gs_event_hotMenu = atomWithStorage("gs_event_hotMenu", 0) * @param status | "Publish", "Review", "Draft", "Reject" * @type string */ -export const gs_event_status = atomWithStorage("gs_status_event", "Publish") \ No newline at end of file +export const gs_event_status = atomWithStorage("gs_status_event", "Publish") +export const gs_event_riwayat = atomWithStorage("gs_event_riwayat", "Semua") \ No newline at end of file diff --git a/src/app_modules/event/index.ts b/src/app_modules/event/index.ts index 3349f72c..1465e41a 100644 --- a/src/app_modules/event/index.ts +++ b/src/app_modules/event/index.ts @@ -19,7 +19,9 @@ import Event_DetailMain from "./detail/main_detail"; import LayoutEvent_DetailMain from "./detail/main_detail/layout"; import Event_DetailKontribusi from "./detail/kontribusi"; import LayoutEvent_DetailKontribusi from "./detail/kontribusi/layout"; -import Event_History from "./main/history"; +import Event_Riwayat from "./main/riwayat"; +import Event_DetailRiwayat from "./detail/riwayat"; +import LayoutEvent_DetailRiwayat from "./detail/riwayat/layout"; export { Event_SplashScreen, @@ -43,5 +45,7 @@ export { LayoutEvent_DetailMain, Event_DetailKontribusi, LayoutEvent_DetailKontribusi, - Event_History, + Event_Riwayat , + Event_DetailRiwayat , + LayoutEvent_DetailRiwayat , }; diff --git a/src/app_modules/event/main/beranda.tsx b/src/app_modules/event/main/beranda.tsx index 1847cab9..64197041 100644 --- a/src/app_modules/event/main/beranda.tsx +++ b/src/app_modules/event/main/beranda.tsx @@ -2,6 +2,7 @@ import { RouterEvent } from "@/app/lib/router_hipmi/router_event"; import { + Affix, Avatar, Badge, Box, @@ -17,6 +18,7 @@ import { Stack, Text, Title, + rem, } from "@mantine/core"; import moment from "moment"; import { useRouter } from "next/navigation"; @@ -25,6 +27,8 @@ import { MODEL_EVENT } from "../model/interface"; import ComponentEvent_BoxListStatus from "../component/box_list_status"; import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog"; import ComponentGlobal_AuthorNameOnHeader from "@/app_modules/component_global/author_name_on_header"; +import _ from "lodash"; +import { IconCirclePlus } from "@tabler/icons-react"; export default function Event_Beranda({ dataEvent, @@ -32,42 +36,72 @@ export default function Event_Beranda({ dataEvent: MODEL_EVENT[]; }) { const router = useRouter(); + + // if (_.isEmpty(dataEvent)) + // return ( + //
+ // + // Tidak Ada Event + // + //
+ // ); return ( <> - {dataEvent.map((e, i) => ( - - - - - router.push(RouterEvent.detail_main + e.id)} - > - - - - - {e.title} - - - - - {moment(e.tanggal).format("ll")} - - - + {/* + + */} - - {e.deskripsi} - - - - - ))} + {_.isEmpty(dataEvent) ? ( +
+ + Tidak Ada Event + +
+ ) : ( + + {dataEvent.map((e, i) => ( + + + + + router.push(RouterEvent.detail_main + e.id)} + > + + + + + {e.title} + + + + + {moment(e.tanggal).format("ll")} + + + + + + {e.deskripsi} + + + + + ))} + + )} ); } diff --git a/src/app_modules/event/main/history/index.tsx b/src/app_modules/event/main/history/index.tsx deleted file mode 100644 index 60e4eb1b..00000000 --- a/src/app_modules/event/main/history/index.tsx +++ /dev/null @@ -1,8 +0,0 @@ -"use client" - -export default function Event_History(){ - return<> - ini history - - -} \ No newline at end of file diff --git a/src/app_modules/event/main/kontribusi/index.tsx b/src/app_modules/event/main/kontribusi/index.tsx index ecb96592..0e6043da 100644 --- a/src/app_modules/event/main/kontribusi/index.tsx +++ b/src/app_modules/event/main/kontribusi/index.tsx @@ -4,6 +4,7 @@ import { Avatar, Box, Card, + Center, Flex, Grid, Group, @@ -21,6 +22,7 @@ import { RouterEvent } from "@/app/lib/router_hipmi/router_event"; import { MODEL_EVENT_PESERTA } from "../../model/interface"; import ComponentGlobal_AuthorNameOnHeader from "@/app_modules/component_global/author_name_on_header"; import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog"; +import _ from "lodash"; export default function Event_Kontribusi({ listKontribusi, @@ -42,6 +44,15 @@ export default function Event_Kontribusi({ }, ]; + if (_.isEmpty(listKontribusi)) + return ( +
+ + Tidak Ada Kontribusi + +
+ ); + return ( <> {/* 
{JSON.stringify(listKontribusi, null,2)}
*/} @@ -56,7 +67,9 @@ export default function Event_Kontribusi({ router.push(RouterEvent.detail_kontribusi + e.Event.id)} + onClick={() => + router.push(RouterEvent.detail_kontribusi + e.Event.id) + } > @@ -77,18 +90,19 @@ export default function Event_Kontribusi({ */} - {e.Event.Event_Peserta.map((val) => ( - - - - ))} + {e.Event.Event_Peserta.map((val) => ( + + + + ))} diff --git a/src/app_modules/event/main/layout.tsx b/src/app_modules/event/main/layout.tsx index d44342b5..fded5554 100644 --- a/src/app_modules/event/main/layout.tsx +++ b/src/app_modules/event/main/layout.tsx @@ -55,10 +55,10 @@ export default function LayoutEvent_Main({ }, { id: "4", - name: "History", - path: RouterEvent.history, + name: "Riwayat", + path: RouterEvent.riwayat, icon: , - } + }, ]; return ( <> @@ -71,6 +71,19 @@ export default function LayoutEvent_Main({ } footer={