upd: task division
Deskripsi: - tambah task divisi - perbaiki routing update progress project No Issues
This commit is contained in:
@@ -50,13 +50,13 @@ const dataTugas = [
|
||||
},
|
||||
];
|
||||
|
||||
export default function ViewDateEndTask() {
|
||||
export default function ViewDateEndTask({ kategori }: { kategori: string }) {
|
||||
const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
|
||||
const router = useRouter()
|
||||
|
||||
return (
|
||||
<Box>
|
||||
<LayoutNavbarNew back="/project/create" title={"Tanggal Tugas"} menu />
|
||||
<LayoutNavbarNew back="" title={"Tanggal Tugas"} menu />
|
||||
<Box p={20}>
|
||||
<Group
|
||||
justify="center"
|
||||
@@ -108,7 +108,7 @@ export default function ViewDateEndTask() {
|
||||
placeholder="Input Nama Tahapan"
|
||||
size="md"
|
||||
/>
|
||||
<Box onClick={() => router.push('/project/create?page=create-users')}>
|
||||
<Box onClick={() => router.push(`/${kategori}/create?page=create-users`)}>
|
||||
<Group
|
||||
justify="space-between"
|
||||
p={10}
|
||||
@@ -176,7 +176,7 @@ export default function ViewDateEndTask() {
|
||||
size="lg"
|
||||
radius={30}
|
||||
fullWidth
|
||||
onClick={() => router.push('/project/create?anggota=yes')}
|
||||
onClick={() => router.push(`/${kategori}/create?anggota=yes`)}
|
||||
>
|
||||
Simpan
|
||||
</Button>
|
||||
|
||||
@@ -43,12 +43,12 @@ const DateUsers = [
|
||||
},
|
||||
];
|
||||
|
||||
export default function CreateUsersProject() {
|
||||
export default function CreateUsersProject({ kategori }: { kategori: string }) {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Box>
|
||||
<LayoutNavbarNew
|
||||
back="/project/create?page=task"
|
||||
back=""
|
||||
title="Pilih Anggota"
|
||||
menu
|
||||
/>
|
||||
@@ -103,7 +103,7 @@ export default function CreateUsersProject() {
|
||||
size="lg"
|
||||
radius={30}
|
||||
fullWidth
|
||||
onClick={() => router.push('/project/create?page=task')}
|
||||
onClick={() => router.push(`/${kategori}/create?page=task`)}
|
||||
>
|
||||
Simpan
|
||||
</Button>
|
||||
|
||||
@@ -43,13 +43,13 @@ const DateUsers = [
|
||||
},
|
||||
];
|
||||
|
||||
export default function DetailCreateUserProject() {
|
||||
export default function DetailCreateUserProject({ kategori }: { kategori: string }) {
|
||||
const router = useRouter();
|
||||
|
||||
return (
|
||||
<Box>
|
||||
<LayoutNavbarNew
|
||||
back="/project/update-detail?page=detail-date-task"
|
||||
back=""
|
||||
title="Pilih Anggota"
|
||||
menu
|
||||
/>
|
||||
@@ -104,7 +104,7 @@ export default function DetailCreateUserProject() {
|
||||
size="lg"
|
||||
radius={30}
|
||||
fullWidth
|
||||
onClick={() => router.push("/project/update-detail?page=detail-date-task")}
|
||||
onClick={() => router.push(`/${kategori}/update/1?page=detail-date-task`)}
|
||||
>
|
||||
Simpan
|
||||
</Button>
|
||||
|
||||
@@ -50,138 +50,138 @@ const dataTugas = [
|
||||
},
|
||||
];
|
||||
|
||||
export default function DetailDateEndTask() {
|
||||
export default function DetailDateEndTask({ kategori }: { kategori: string }) {
|
||||
const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Box>
|
||||
<LayoutNavbarNew back="/project/update-detail" title={"Tanggal Tugas"} menu />
|
||||
<Box p={20}>
|
||||
<Group
|
||||
justify="center"
|
||||
bg={"white"}
|
||||
py={20}
|
||||
style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
|
||||
>
|
||||
<DatePicker
|
||||
styles={{}}
|
||||
type="range"
|
||||
value={value}
|
||||
onChange={setValue}
|
||||
size="md"
|
||||
c={WARNA.biruTua}
|
||||
/>
|
||||
</Group>
|
||||
<SimpleGrid cols={{ base: 2, sm: 2, lg: 2 }} mt={20}>
|
||||
<Box>
|
||||
<Text>Tanggal Mulai</Text>
|
||||
<Group
|
||||
justify="center"
|
||||
bg={"white"}
|
||||
h={45}
|
||||
style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
|
||||
>
|
||||
<Text>{value[0] ? `${value[0].toLocaleDateString()}` : ""}</Text>
|
||||
</Group>
|
||||
</Box>
|
||||
<Box>
|
||||
<Text c={WARNA.biruTua}>Tanggal Berakhir</Text>
|
||||
<Group
|
||||
justify="center"
|
||||
bg={"white"}
|
||||
h={45}
|
||||
style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
|
||||
>
|
||||
<Text>{value[1] ? `${value[1].toLocaleDateString()}` : ""}</Text>
|
||||
</Group>
|
||||
</Box>
|
||||
</SimpleGrid>
|
||||
<Stack pt={15}>
|
||||
<Input
|
||||
styles={{
|
||||
input: {
|
||||
border: `1px solid ${"#D6D8F6"}`,
|
||||
borderRadius: 10,
|
||||
},
|
||||
}}
|
||||
placeholder="Input Nama Tahapan"
|
||||
size="md"
|
||||
/>
|
||||
<Box onClick={() => router.push('/project/update-detail?page=detail-create-user')}>
|
||||
<Group
|
||||
justify="space-between"
|
||||
p={10}
|
||||
style={{
|
||||
border: `1px solid ${"#D6D8F6"}`,
|
||||
borderRadius: 10,
|
||||
}}
|
||||
>
|
||||
<Text c={WARNA.biruTua}>Tambah Anggota</Text>
|
||||
<IoIosArrowDropright size={25} />
|
||||
</Group>
|
||||
</Box>
|
||||
</Stack>
|
||||
<Box pt={30}>
|
||||
<Group justify="space-between">
|
||||
<Text c={WARNA.biruTua}>Anggota Terpilih</Text>
|
||||
<Text c={WARNA.biruTua}>Total 10 Anggota</Text>
|
||||
<LayoutNavbarNew back="" title={"Tanggal Tugas"} menu />
|
||||
<Box p={20}>
|
||||
<Group
|
||||
justify="center"
|
||||
bg={"white"}
|
||||
py={20}
|
||||
style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
|
||||
>
|
||||
<DatePicker
|
||||
styles={{}}
|
||||
type="range"
|
||||
value={value}
|
||||
onChange={setValue}
|
||||
size="md"
|
||||
c={WARNA.biruTua}
|
||||
/>
|
||||
</Group>
|
||||
<Box pt={10}>
|
||||
<Box mb={20}>
|
||||
<Box
|
||||
<SimpleGrid cols={{ base: 2, sm: 2, lg: 2 }} mt={20}>
|
||||
<Box>
|
||||
<Text>Tanggal Mulai</Text>
|
||||
<Group
|
||||
justify="center"
|
||||
bg={"white"}
|
||||
h={45}
|
||||
style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
|
||||
>
|
||||
<Text>{value[0] ? `${value[0].toLocaleDateString()}` : ""}</Text>
|
||||
</Group>
|
||||
</Box>
|
||||
<Box>
|
||||
<Text c={WARNA.biruTua}>Tanggal Berakhir</Text>
|
||||
<Group
|
||||
justify="center"
|
||||
bg={"white"}
|
||||
h={45}
|
||||
style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
|
||||
>
|
||||
<Text>{value[1] ? `${value[1].toLocaleDateString()}` : ""}</Text>
|
||||
</Group>
|
||||
</Box>
|
||||
</SimpleGrid>
|
||||
<Stack pt={15}>
|
||||
<Input
|
||||
styles={{
|
||||
input: {
|
||||
border: `1px solid ${"#D6D8F6"}`,
|
||||
borderRadius: 10,
|
||||
},
|
||||
}}
|
||||
placeholder="Input Nama Tahapan"
|
||||
size="md"
|
||||
/>
|
||||
<Box onClick={() => router.push(`/${kategori}/update/1?page=detail-create-user`)}>
|
||||
<Group
|
||||
justify="space-between"
|
||||
p={10}
|
||||
style={{
|
||||
border: `1px solid ${"#C7D6E8"}`,
|
||||
border: `1px solid ${"#D6D8F6"}`,
|
||||
borderRadius: 10,
|
||||
}}
|
||||
px={20}
|
||||
py={10}
|
||||
>
|
||||
<Text c={WARNA.biruTua} fw={"bold"}>
|
||||
Divisi Kerohanian
|
||||
</Text>
|
||||
{dataTugas.map((v, i) => {
|
||||
return (
|
||||
<Flex
|
||||
justify={"space-between"}
|
||||
align={"center"}
|
||||
mt={20}
|
||||
key={i}
|
||||
>
|
||||
<Group>
|
||||
<Avatar src={v.image} alt="it's me" size="lg" />
|
||||
<Box>
|
||||
<Text c={WARNA.biruTua} fw={"bold"}>
|
||||
{v.name}
|
||||
</Text>
|
||||
<Text c={"#5A687D"} fz={14}>
|
||||
{v.email}
|
||||
</Text>
|
||||
</Box>
|
||||
</Group>
|
||||
<Text c={WARNA.biruTua} fw={"bold"}>
|
||||
Anggota
|
||||
</Text>
|
||||
</Flex>
|
||||
);
|
||||
})}
|
||||
<Text c={WARNA.biruTua}>Tambah Anggota</Text>
|
||||
<IoIosArrowDropright size={25} />
|
||||
</Group>
|
||||
</Box>
|
||||
</Stack>
|
||||
<Box pt={30}>
|
||||
<Group justify="space-between">
|
||||
<Text c={WARNA.biruTua}>Anggota Terpilih</Text>
|
||||
<Text c={WARNA.biruTua}>Total 10 Anggota</Text>
|
||||
</Group>
|
||||
<Box pt={10}>
|
||||
<Box mb={20}>
|
||||
<Box
|
||||
style={{
|
||||
border: `1px solid ${"#C7D6E8"}`,
|
||||
borderRadius: 10,
|
||||
}}
|
||||
px={20}
|
||||
py={10}
|
||||
>
|
||||
<Text c={WARNA.biruTua} fw={"bold"}>
|
||||
Divisi Kerohanian
|
||||
</Text>
|
||||
{dataTugas.map((v, i) => {
|
||||
return (
|
||||
<Flex
|
||||
justify={"space-between"}
|
||||
align={"center"}
|
||||
mt={20}
|
||||
key={i}
|
||||
>
|
||||
<Group>
|
||||
<Avatar src={v.image} alt="it's me" size="lg" />
|
||||
<Box>
|
||||
<Text c={WARNA.biruTua} fw={"bold"}>
|
||||
{v.name}
|
||||
</Text>
|
||||
<Text c={"#5A687D"} fz={14}>
|
||||
{v.email}
|
||||
</Text>
|
||||
</Box>
|
||||
</Group>
|
||||
<Text c={WARNA.biruTua} fw={"bold"}>
|
||||
Anggota
|
||||
</Text>
|
||||
</Flex>
|
||||
);
|
||||
})}
|
||||
</Box>
|
||||
</Box>
|
||||
</Box>
|
||||
</Box>
|
||||
</Box>
|
||||
<Box mt={"xl"}>
|
||||
<Button
|
||||
c={"white"}
|
||||
bg={WARNA.biruTua}
|
||||
size="lg"
|
||||
radius={30}
|
||||
fullWidth
|
||||
onClick={() => router.push('/project/update-detail?tugas=yes')}
|
||||
>
|
||||
Simpan
|
||||
</Button>
|
||||
<Box mt={"xl"}>
|
||||
<Button
|
||||
c={"white"}
|
||||
bg={WARNA.biruTua}
|
||||
size="lg"
|
||||
radius={30}
|
||||
fullWidth
|
||||
onClick={() => router.push(`/${kategori}/update/1?tugas=yes`)}
|
||||
>
|
||||
Simpan
|
||||
</Button>
|
||||
</Box>
|
||||
</Box>
|
||||
</Box>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ export default function DetailProject() {
|
||||
size="lg"
|
||||
radius="lg"
|
||||
aria-label="Settings"
|
||||
onClick={() => router.push("/project/update-detail")}
|
||||
onClick={() => router.push("/project/update/1")}
|
||||
>
|
||||
<LuClipboardEdit size={20} color="white" />
|
||||
</ActionIcon>
|
||||
|
||||
@@ -33,7 +33,7 @@ const dataFile = [
|
||||
];
|
||||
|
||||
|
||||
export default function FileUploadProgres() {
|
||||
export default function FileUploadProgres({ kategori }: { kategori: string }) {
|
||||
const router = useRouter()
|
||||
const [selectedFiles, setSelectedFiles] = useState<Record<number, boolean>>({});
|
||||
|
||||
@@ -46,7 +46,7 @@ export default function FileUploadProgres() {
|
||||
|
||||
return (
|
||||
<Box>
|
||||
<LayoutNavbarNew back="/project/create" title="File Tersimpan" menu />
|
||||
<LayoutNavbarNew back="" title="File Tersimpan" menu />
|
||||
<Box p={20}>
|
||||
<SimpleGrid
|
||||
cols={{ base: 2, sm: 2, lg: 2 }}
|
||||
@@ -78,7 +78,7 @@ export default function FileUploadProgres() {
|
||||
})}
|
||||
</SimpleGrid>
|
||||
<Box mt="xl">
|
||||
<Button color="white" bg={WARNA.biruTua} size="lg" radius={30} fullWidth onClick={() => router.push('/project/update-detail')}>
|
||||
<Button color="white" bg={WARNA.biruTua} size="lg" radius={30} fullWidth onClick={() => router.push(`/${kategori}/update/1`)}>
|
||||
Simpan
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
@@ -49,7 +49,7 @@ export default function UpdateProgres({ searchParams }: { searchParams: any }) {
|
||||
borderRadius: 10,
|
||||
}}
|
||||
onClick={() =>
|
||||
router.push("/project/update-detail?page=detail-date-task")
|
||||
router.push("/project/update/1?page=detail-date-task")
|
||||
}
|
||||
>
|
||||
<Text>Tambah Tanggal & Tugas</Text>
|
||||
@@ -256,7 +256,7 @@ export default function UpdateProgres({ searchParams }: { searchParams: any }) {
|
||||
</Box>
|
||||
<Box
|
||||
onClick={() =>
|
||||
router.push("/project/update-detail?page=upload-progres")
|
||||
router.push("/project/update/1?page=upload-progres")
|
||||
}
|
||||
>
|
||||
<Box
|
||||
|
||||
@@ -33,7 +33,7 @@ const dataFile = [
|
||||
];
|
||||
|
||||
|
||||
export default function FileSave() {
|
||||
export default function FileSave({ kategori }: { kategori: string }) {
|
||||
const router = useRouter()
|
||||
const [selectedFiles, setSelectedFiles] = useState<Record<number, boolean>>({});
|
||||
|
||||
@@ -46,7 +46,7 @@ export default function FileSave() {
|
||||
|
||||
return (
|
||||
<Box>
|
||||
<LayoutNavbarNew back="/project/create" title="File Tersimpan" menu />
|
||||
<LayoutNavbarNew back="" title="File Tersimpan" menu />
|
||||
<Box p={20}>
|
||||
<SimpleGrid
|
||||
cols={{ base: 2, sm: 2, lg: 2 }}
|
||||
@@ -78,7 +78,7 @@ export default function FileSave() {
|
||||
})}
|
||||
</SimpleGrid>
|
||||
<Box mt="xl">
|
||||
<Button color="white" bg={WARNA.biruTua} size="lg" radius={30} fullWidth onClick={() => router.push('/project/create?anggota=yes&files=yes&button=yes')}>
|
||||
<Button color="white" bg={WARNA.biruTua} size="lg" radius={30} fullWidth onClick={() => router.push(`/${kategori}/create?anggota=yes&files=yes&button=yes`)}>
|
||||
Simpan
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import React from 'react';
|
||||
import FileSave from '../components/file_save';
|
||||
|
||||
export default function ViewFileSave() {
|
||||
export default function ViewFileSave({ kategori }: { kategori: string }) {
|
||||
return (
|
||||
<FileSave/>
|
||||
<FileSave kategori={kategori} />
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user