Update Versi 1.5.27 #32

Merged
bagasbanuna merged 1009 commits from staging into main 2025-12-17 12:22:28 +08:00
1633 changed files with 66140 additions and 18462 deletions
Showing only changes of commit 3b9ce47767 - Show all commits

View File

@@ -1,5 +1,6 @@
import { UIGlobal_LayoutHeaderTamplate } from "@/app_modules/_global/ui"; import { Component_Header } from "@/app_modules/_global/component/new/component_header";
import { Notifikasi_UiNewLayout } from "@/app_modules/notifikasi/_ui"; import UI_NewLayoutTamplate, { UI_NewChildren, UI_NewHeader } from "@/app_modules/_global/ui/V2_layout_tamplate";
import { UIChildrenNotifikasi } from "@/app_modules/notifikasi/_ui/ui_new_layout_notifikasi";
export default async function Layout({ export default async function Layout({
children, children,
@@ -8,11 +9,22 @@ export default async function Layout({
}) { }) {
return ( return (
<> <>
<Notifikasi_UiNewLayout {/* <Notifikasi_UiNewLayout
header={<UIGlobal_LayoutHeaderTamplate title="Notifikasi" />} header={<UIGlobal_LayoutHeaderTamplate title="Notifikasi" />}
> >
{children} {children}
</Notifikasi_UiNewLayout> </Notifikasi_UiNewLayout> */}
<UI_NewLayoutTamplate>
<UI_NewHeader>
<Component_Header title="Notifikasi" />
</UI_NewHeader>
<UI_NewChildren>
<UIChildrenNotifikasi>
{children}
</UIChildrenNotifikasi>
</UI_NewChildren>
</UI_NewLayoutTamplate>
</> </>
); );
} }

View File

@@ -46,7 +46,7 @@ export default function Notifikasi_UiNewLayout({
> >
<UIHeader header={header} /> <UIHeader header={header} />
<UIChildren>{children}</UIChildren> <UIChildrenNotifikasi>{children}</UIChildrenNotifikasi>
</BackgroundImage> </BackgroundImage>
</Container> </Container>
</Box> </Box>
@@ -76,7 +76,7 @@ function UIHeader({ header }: { header: React.ReactNode }) {
); );
} }
function UIChildren({ children }: { children: React.ReactNode }) { export function UIChildrenNotifikasi({ children }: { children: React.ReactNode }) {
const router = useRouter(); const router = useRouter();
const [mstrKategori, setMstrKategori] = useState<any[] | null>(null); const [mstrKategori, setMstrKategori] = useState<any[] | null>(null);
const [categoryPage, setCategoryPage] = useAtom(gs_notifikasi_kategori_app); const [categoryPage, setCategoryPage] = useAtom(gs_notifikasi_kategori_app);
@@ -100,7 +100,7 @@ function UIChildren({ children }: { children: React.ReactNode }) {
Null Null
</Button> </Button>
) : ( ) : (
<Box style={{ zIndex: 0 }} h={"92vh"} px={"xs"} pos={"static"}> <Box style={{ zIndex: 0 }} h={"90vh"} pos={"static"}>
<Box <Box
mb={"xs"} mb={"xs"}
style={{ style={{