diff --git a/src/app/api/home/route.ts b/src/app/api/home/route.ts index 765bcb8..918c174 100644 --- a/src/app/api/home/route.ts +++ b/src/app/api/home/route.ts @@ -300,8 +300,9 @@ export async function GET(request: Request) { }) allData = data.map((v: any) => ({ - ..._.omit(v, ["User"]), - user_name: v.User.name, + ..._.omit(v, ["DivisionCalendar", "User"]), + user_name: v.DivisionCalendar.User.name, + title: v.DivisionCalendar.title, timeStart: moment.utc(v.timeStart).format('HH:mm'), timeEnd: moment.utc(v.timeEnd).format('HH:mm') })) @@ -364,6 +365,6 @@ export async function GET(request: Request) { } catch (error) { console.error(error); - return NextResponse.json({ success: false, message: "Gagal mendapatkan data, coba lagi nanti", reason: (error as Error).message, }, { status: 500 }); + return NextResponse.json({ success: false, message: "Gagal mendapatkan data, coba lagi nanti 99", reason: (error as Error).message, }, { status: 500 }); } } \ No newline at end of file diff --git a/src/app/layout.tsx b/src/app/layout.tsx index fe6ab8c..79c6a58 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -37,7 +37,6 @@ export default function RootLayout({ diff --git a/src/module/calender/ui/update_division_calender.tsx b/src/module/calender/ui/update_division_calender.tsx index 11bb57c..d38aa5f 100644 --- a/src/module/calender/ui/update_division_calender.tsx +++ b/src/module/calender/ui/update_division_calender.tsx @@ -90,7 +90,7 @@ export default function UpdateDivisionCalender() { - + {loading ? <>