diff --git a/src/app/(application)/(detail-division)/calender/create/page.tsx b/src/app/(application)/(detail-division)/calender/create/page.tsx
index b37380e..b6cb06e 100644
--- a/src/app/(application)/(detail-division)/calender/create/page.tsx
+++ b/src/app/(application)/(detail-division)/calender/create/page.tsx
@@ -1,9 +1,15 @@
-import { ViewCreateDivisionCalender } from '@/module/division_new';
+import { CreateUserDivisionCalender, UlangiEvent, ViewCreateDivisionCalender } from '@/module/division_new';
 import React from 'react';
 
-function Page() {
+function Page({ searchParams }: { searchParams: any }) {
+  if (searchParams.page == "ulangi-event")
+    return <UlangiEvent />
+  if (searchParams.page == "user-calender")
+    return <CreateUserDivisionCalender />
+
+  
   return (
-    <ViewCreateDivisionCalender/>
+    <ViewCreateDivisionCalender />
   );
 }
 
diff --git a/src/app/(application)/(detail-division)/calender/history/page.tsx b/src/app/(application)/(detail-division)/calender/history/page.tsx
new file mode 100644
index 0000000..555fef3
--- /dev/null
+++ b/src/app/(application)/(detail-division)/calender/history/page.tsx
@@ -0,0 +1,10 @@
+import { ViewHistoryDivisionCalender } from '@/module/division_new';
+import React from 'react';
+
+function Page() {
+  return (
+    <ViewHistoryDivisionCalender />
+  );
+}
+
+export default Page;
diff --git a/src/app/(application)/(detail-division)/calender/page.tsx b/src/app/(application)/(detail-division)/calender/page.tsx
index ec16ade..11fdf6e 100644
--- a/src/app/(application)/(detail-division)/calender/page.tsx
+++ b/src/app/(application)/(detail-division)/calender/page.tsx
@@ -1,7 +1,9 @@
-import { ViewDivisionCalender } from '@/module/division_new';
+import { ViewDetailEventDivision, ViewDivisionCalender } from '@/module/division_new';
 import React from 'react';
 
-function Page() {
+function Page({ searchParams }: { searchParams: any }) {
+  if (searchParams.page == "detail-event")
+    return <ViewDetailEventDivision />
   return (
     <ViewDivisionCalender />
   );
diff --git a/src/app/(application)/(detail-division)/calender/update/page.tsx b/src/app/(application)/(detail-division)/calender/update/page.tsx
new file mode 100644
index 0000000..bb7a12e
--- /dev/null
+++ b/src/app/(application)/(detail-division)/calender/update/page.tsx
@@ -0,0 +1,14 @@
+import { UpdateUlangiEvent, UpdateUserDivisionCalender, ViewUpdateDivisionCalender } from '@/module/division_new';
+import React from 'react';
+
+function Page({ searchParams }: { searchParams: any }) {
+  if (searchParams.page == "update-ulangi-event")
+    return <UpdateUlangiEvent />
+  if (searchParams.page == "update-user-calender")
+    return <UpdateUserDivisionCalender />
+  return (
+    <ViewUpdateDivisionCalender/>
+  );
+}
+
+export default Page;
diff --git a/src/module/division_new/_division_fitur/calender/view/view_detail_event_division.tsx b/src/module/division_new/_division_fitur/calender/view/view_detail_event_division.tsx
new file mode 100644
index 0000000..43ed7d7
--- /dev/null
+++ b/src/module/division_new/_division_fitur/calender/view/view_detail_event_division.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import DetailEventDivision from '../components/detail_event_division';
+
+export default function ViewDetailEventDivision() {
+  return (
+    <DetailEventDivision/>
+  );
+}
+
diff --git a/src/module/division_new/_division_fitur/calender/view/view_history_division_calender.tsx b/src/module/division_new/_division_fitur/calender/view/view_history_division_calender.tsx
new file mode 100644
index 0000000..58da010
--- /dev/null
+++ b/src/module/division_new/_division_fitur/calender/view/view_history_division_calender.tsx
@@ -0,0 +1,12 @@
+import { Box } from '@mantine/core';
+import React from 'react';
+import HistoryDivisionCalender from '../components/history_division_calender';
+
+export default function ViewHistoryDivisionCalender() {
+  return (
+    <Box>
+      <HistoryDivisionCalender />
+    </Box>
+  );
+}
+
diff --git a/src/module/division_new/_division_fitur/calender/view/view_update_division_calender.tsx b/src/module/division_new/_division_fitur/calender/view/view_update_division_calender.tsx
new file mode 100644
index 0000000..1681d7e
--- /dev/null
+++ b/src/module/division_new/_division_fitur/calender/view/view_update_division_calender.tsx
@@ -0,0 +1,11 @@
+import { Box } from '@mantine/core';
+import React from 'react';
+import UpdateDivisionCalender from '../components/update_calander/update_division_calender';
+
+export default function ViewUpdateDivisionCalender() {
+  return (
+    <Box>
+      <UpdateDivisionCalender/>
+    </Box>
+  );
+}
diff --git a/src/module/division_new/components/discussion_report.tsx b/src/module/division_new/components/discussion_report.tsx
index 1dae551..e58838b 100644
--- a/src/module/division_new/components/discussion_report.tsx
+++ b/src/module/division_new/components/discussion_report.tsx
@@ -43,7 +43,7 @@ export default function DiscussionReport() {
                         }} mb={10}>
                             <Group align="center">
                                 <GoDiscussionClosed size={25} />
-                                <Box w={{ base: 230, md: 400 }}>
+                                <Box w={{ base: 230, md: 300 }}>
                                     <Text truncate="end" fw={'bold'}>{v.judul}</Text>
                                 </Box>
                             </Group>
diff --git a/src/module/division_new/index.ts b/src/module/division_new/index.ts
index 9681368..c009ce9 100644
--- a/src/module/division_new/index.ts
+++ b/src/module/division_new/index.ts
@@ -1,5 +1,12 @@
+import CreateUserDivisionCalender from "./_division_fitur/calender/components/create_user_division_calender";
+import UlangiEvent from "./_division_fitur/calender/components/ulangi_event";
+import UpdateUlangiEvent from "./_division_fitur/calender/components/update_calander/update_ulangi_event";
+import UpdateUserDivisionCalender from "./_division_fitur/calender/components/update_calander/update_user_division_calender";
 import ViewCreateDivisionCalender from "./_division_fitur/calender/view/view_create_division_calender";
+import ViewDetailEventDivision from "./_division_fitur/calender/view/view_detail_event_division";
 import ViewDivisionCalender from "./_division_fitur/calender/view/view_division_calender";
+import ViewHistoryDivisionCalender from "./_division_fitur/calender/view/view_history_division_calender";
+import ViewUpdateDivisionCalender from "./_division_fitur/calender/view/view_update_division_calender";
 import ViewCreateTaskDivision from "./_division_fitur/task/view/view_create_division_task";
 import ViewDetailDivisionTask from "./_division_fitur/task/view/view_detail_division_task";
 import ViewDivisionTask from "./_division_fitur/task/view/view_division_task";
@@ -22,4 +29,11 @@ export { ViewDetailDivisionTask }
 export { ViewUpdateProgressDivisionTask }
 export { ViewDivisionCalender }
 export { ViewCreateDivisionCalender }
-export { ViewCreateTaskDivision }
\ No newline at end of file
+export { ViewCreateTaskDivision }
+export { UlangiEvent }
+export { CreateUserDivisionCalender }
+export { ViewHistoryDivisionCalender }
+export { ViewDetailEventDivision }
+export { ViewUpdateDivisionCalender }
+export { UpdateUserDivisionCalender }
+export { UpdateUlangiEvent }
\ No newline at end of file