diff --git a/src/app/dev/colab/main/layout.tsx b/src/app/dev/colab/main/layout.tsx index 1405cf35..57a49c42 100644 --- a/src/app/dev/colab/main/layout.tsx +++ b/src/app/dev/colab/main/layout.tsx @@ -1,5 +1,4 @@ import { LayoutColab_Main } from "@/app_modules/colab"; -import colab_CekNotifikasi from "@/app_modules/colab/fun/get/cek_notifikasi"; import React from "react"; export default async function Layout({ @@ -7,11 +6,10 @@ export default async function Layout({ }: { children: React.ReactNode; }) { - const cekNotif = await colab_CekNotifikasi(); return ( <> - {children} + {children} ); } diff --git a/src/app_modules/_global/ui/V2_layout_tamplate.tsx b/src/app_modules/_global/ui/V2_layout_tamplate.tsx index aea17c24..acce22e4 100644 --- a/src/app_modules/_global/ui/V2_layout_tamplate.tsx +++ b/src/app_modules/_global/ui/V2_layout_tamplate.tsx @@ -134,7 +134,7 @@ export function UI_NewChildren({ children }: { children: ReactNode }) { const { classes } = useStyles(); return ( - + {children} diff --git a/src/app_modules/colab/component/comp_new_footer_collaboration.tsx b/src/app_modules/colab/component/comp_new_footer_collaboration.tsx new file mode 100644 index 00000000..4f41bb35 --- /dev/null +++ b/src/app_modules/colab/component/comp_new_footer_collaboration.tsx @@ -0,0 +1,64 @@ +import { useAtom } from "jotai"; +import { useRouter } from "next/navigation"; +import { gs_colab_hot_menu } from "../global_state"; +import { useState } from "react"; + +import { IconHome, IconMessages, IconUsersGroup } from "@tabler/icons-react"; +import { RouterColab } from "@/lib/router_hipmi/router_colab"; +import { MainColor } from "@/app_modules/_global/color"; +import { SimpleGrid, Stack, ActionIcon, Text } from "@mantine/core"; + +export function Collaboration_ComponentNewFooter() { + const router = useRouter(); + const [hotMenu, setHotMenu] = useAtom(gs_colab_hot_menu); + const [loading, setLoading] = useState(false); + + const listFooter = [ + { + id: 1, + name: "Beranda", + path: RouterColab.beranda, + icon: , + }, + { + id: 2, + name: "Partisipasi", + path: RouterColab.proyek, + icon: , + }, + { + id: 3, + name: "Grup Diskusi", + path: RouterColab.grup_diskusi, + icon: , + }, + ]; + return ( + <> + + {listFooter.map((e) => ( + + { + router.replace(e.path, { scroll: false }); + setHotMenu(e.id); + }} + > + {e.icon} + + + {e.name} + + + ))} + + + ); +} diff --git a/src/app_modules/colab/create/layout.tsx b/src/app_modules/colab/create/layout.tsx index 81b9c61b..5b348c6b 100644 --- a/src/app_modules/colab/create/layout.tsx +++ b/src/app_modules/colab/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 LayoutColab_Create({ @@ -11,11 +14,18 @@ export default function LayoutColab_Create({ }) { return ( <> - } > {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/colab/detail/info_grup/index.tsx b/src/app_modules/colab/detail/info_grup/index.tsx index 6e5a55b5..51061b1a 100644 --- a/src/app_modules/colab/detail/info_grup/index.tsx +++ b/src/app_modules/colab/detail/info_grup/index.tsx @@ -22,15 +22,26 @@ import { import { MODEL_COLLABORATION_ROOM_CHAT } from "../../model/interface"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { UI_NewHeader, UI_NewChildren } from "@/app_modules/_global/ui/V2_layout_tamplate"; export default function Colab_DetailInfoGrup() { return ( <> - } > - + */} + + + + + + + + + ); } diff --git a/src/app_modules/colab/detail/main_detail/layout.tsx b/src/app_modules/colab/detail/main_detail/layout.tsx index ba21b78d..7ecaa27c 100644 --- a/src/app_modules/colab/detail/main_detail/layout.tsx +++ b/src/app_modules/colab/detail/main_detail/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 LayoutColab_MainDetail({ @@ -15,7 +18,7 @@ export default function LayoutColab_MainDetail({ }) { return ( <> - {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/colab/detail/proyek/partisipasi/layout.tsx b/src/app_modules/colab/detail/proyek/partisipasi/layout.tsx index 2a530e7a..03feed3b 100644 --- a/src/app_modules/colab/detail/proyek/partisipasi/layout.tsx +++ b/src/app_modules/colab/detail/proyek/partisipasi/layout.tsx @@ -1,7 +1,12 @@ "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_NewHeader, + UI_NewChildren, +} from "@/app_modules/_global/ui/V2_layout_tamplate"; export default function LayoutColab_DetailPartisipasiProyek({ children, @@ -10,11 +15,18 @@ export default function LayoutColab_DetailPartisipasiProyek({ }) { return ( <> - } > {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/colab/detail/proyek/saya/layout.tsx b/src/app_modules/colab/detail/proyek/saya/layout.tsx index 04e112f7..428f5a3f 100644 --- a/src/app_modules/colab/detail/proyek/saya/layout.tsx +++ b/src/app_modules/colab/detail/proyek/saya/layout.tsx @@ -8,6 +8,8 @@ import { ActionIcon } from "@mantine/core"; import { IconDotsVertical, IconEdit } from "@tabler/icons-react"; import { useParams } from "next/navigation"; import React, { useState } from "react"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { UI_NewHeader, UI_NewChildren } from "@/app_modules/_global/ui/V2_layout_tamplate"; export default function LayoutColab_DetailProyekSaya({ children, @@ -27,7 +29,7 @@ export default function LayoutColab_DetailProyekSaya({ return ( <> - {children} - + */} + + + + setOpenDrawer(true)} + > + + + } + /> + + {children} + - }> + {/* }> {children} - + */} + + + + + + {children} + ); } diff --git a/src/app_modules/colab/main/beranda.tsx b/src/app_modules/colab/main/beranda.tsx index f955582b..a744fd8e 100644 --- a/src/app_modules/colab/main/beranda.tsx +++ b/src/app_modules/colab/main/beranda.tsx @@ -77,7 +77,7 @@ export default function Colab_Beranda({ ) : ( (
diff --git a/src/app_modules/colab/main/grup/index.tsx b/src/app_modules/colab/main/grup/index.tsx index 8381afd3..8efc722f 100644 --- a/src/app_modules/colab/main/grup/index.tsx +++ b/src/app_modules/colab/main/grup/index.tsx @@ -54,7 +54,7 @@ export default function Colab_GrupDiskus() { ) : ( (
diff --git a/src/app_modules/colab/main/layout.tsx b/src/app_modules/colab/main/layout.tsx index ec8a9df5..79fd8966 100644 --- a/src/app_modules/colab/main/layout.tsx +++ b/src/app_modules/colab/main/layout.tsx @@ -11,13 +11,14 @@ import { useAtom } from "jotai"; import { useRouter } from "next/navigation"; import React, { useState } from "react"; import { gs_colab_hot_menu } from "../global_state"; +import { Collaboration_ComponentNewFooter } from "../component/comp_new_footer_collaboration"; +import { Component_Header } from "@/app_modules/_global/component/new/component_header"; +import UI_NewLayoutTamplate, { UI_NewHeader, UI_NewChildren, UI_NewFooter } from "@/app_modules/_global/ui/V2_layout_tamplate"; export default function LayoutColab_Main({ children, - cekNotif, }: { children: React.ReactNode; - cekNotif: boolean; }) { const router = useRouter(); const [hotMenu, setHotMenu] = useAtom(gs_colab_hot_menu); @@ -46,7 +47,20 @@ export default function LayoutColab_Main({ return ( <> - + + + + {children} + + + + + + {/* - //
- // {/* {value} */} - // - // - // {listFooter.map((e) => ( - // - //
- // { - // router.replace(e.path); - // setHotMenu(e.id); - // }} - // > - // - // {e.icon} - // - // - // {e.name} - // - // - //
- //
- // ))} - //
- //
- //
} > {children} -
+
*/} ); } diff --git a/src/app_modules/colab/main/proyek/partisipasi.tsx b/src/app_modules/colab/main/proyek/partisipasi.tsx index b2179d2d..75a8a39f 100644 --- a/src/app_modules/colab/main/proyek/partisipasi.tsx +++ b/src/app_modules/colab/main/proyek/partisipasi.tsx @@ -49,7 +49,7 @@ export default function Colab_PartisipasiProyek() { ) : ( (
diff --git a/src/app_modules/colab/main/proyek/saya.tsx b/src/app_modules/colab/main/proyek/saya.tsx index 6826aaa4..4d5d2f69 100644 --- a/src/app_modules/colab/main/proyek/saya.tsx +++ b/src/app_modules/colab/main/proyek/saya.tsx @@ -48,7 +48,7 @@ export default function Colab_ProyekSaya() { // --- Main component --- // (
diff --git a/src/lib/router_hipmi/router_admin.ts b/src/lib/router_hipmi/router_admin.ts index b6e1e677..8fa80599 100644 --- a/src/lib/router_hipmi/router_admin.ts +++ b/src/lib/router_hipmi/router_admin.ts @@ -34,7 +34,7 @@ export const RouterAdminDonasi_OLD = { pencairan_dana: "/dev/admin/donasi/pencairan_dana/", }; -export const RouterColab = { +export const RouterAdminColab = { // detail detail_publish: "/dev/admin/colab/detail/publish/", }