Merge pull request #103 from bipproduction/amalia/9-agustus-24

fitur: divisi
This commit is contained in:
Amalia
2024-08-09 17:26:08 +08:00
committed by GitHub
32 changed files with 821 additions and 353 deletions

View File

@@ -1,9 +1,21 @@
import { ViewDetailDivision } from '@/module/division_new';
import { NavbarDetailDivision, CarouselDivision, FeatureDetailDivision, ListTaskOnDetailDivision, ListDocumentOnDetailDivision, ListDiscussionOnDetailDivision } from '@/module/division_new';
import { Box, Stack } from '@mantine/core';
import React from 'react';
function Page({ params }: { params: { id: string } }) {
return (
<ViewDetailDivision id={params.id}/>
<Box>
<NavbarDetailDivision />
<Box p={20}>
<Stack>
<CarouselDivision />
<FeatureDetailDivision/>
<ListTaskOnDetailDivision />
<ListDocumentOnDetailDivision />
<ListDiscussionOnDetailDivision />
</Stack>
</Box>
</Box>
);
}

View File

@@ -1,13 +1,9 @@
import { CreateAdminDivision, CreateUsers, ViewCreateDivision } from '@/module/division_new';
import { CreateDivision } from '@/module/division_new';
import React from 'react';
function Page({ searchParams }: { searchParams: { page: string } }) {
// if (searchParams.page == "anggota")
// return <CreateUsers grup=''/>
// if (searchParams.page == "pilih-admin")
// return <CreateAdminDivision />
function Page() {
return (
<ViewCreateDivision/>
<CreateDivision/>
);
}

View File

@@ -1,6 +1,5 @@
import { ViewFilter } from '@/module/_global';
import { ViewCreateReport, ViewDivision } from '@/module/division_new';
import { ListDivision, ViewCreateReport } from '@/module/division_new';
import React from 'react';
function Page({ searchParams }: { searchParams: { page: string } }) {
@@ -9,7 +8,7 @@ function Page({ searchParams }: { searchParams: { page: string } }) {
if (searchParams.page == "report")
return <ViewCreateReport />
return (
<ViewDivision/>
<ListDivision/>
);
}