Merge pull request #215 from bipproduction/lukman/10-september-2024
style : layout
This commit is contained in:
@@ -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 });
|
||||
}
|
||||
}
|
||||
@@ -37,7 +37,6 @@ export default function RootLayout({
|
||||
<MantineProvider>
|
||||
<Box bg={'#252A2F'} pos={"fixed"} w={"100%"} h={"100%"} style={{
|
||||
overflowY: "auto",
|
||||
touchAction: "manipulation"
|
||||
}}>
|
||||
<Toaster/>
|
||||
<Container mih={'100vh'} p={0} size={rem(550)} bg={WARNA.bgWhite}>
|
||||
|
||||
@@ -90,7 +90,7 @@ export default function UpdateDivisionCalender() {
|
||||
<Box>
|
||||
<LayoutNavbarNew back='' title="Edit acara" menu />
|
||||
<Box p={20}>
|
||||
<Stack>
|
||||
<Stack mb={100}>
|
||||
{loading ?
|
||||
<>
|
||||
<Skeleton height={40} mt={25} radius={10} />
|
||||
|
||||
Reference in New Issue
Block a user