Merge branch 'join' into lukman/15-juli-2024

src/app/(application)/(detail-division)/task/create/page.tsx

@@ -0,0 +1,15 @@
+import { ViewCreateTaskDivision } from "@/module/division_new";
+import { ViewDateEndTask, CreateUsersProject, ViewFileSave } from "@/module/project";
+
+function Page({ searchParams }: { searchParams: any }) {
+   if (searchParams.page == "task")
+      return <ViewDateEndTask kategori="task"/>;
+   if (searchParams.page == "create-users")
+      return <CreateUsersProject kategori="task"/>
+   if (searchParams.page == "file-save")
+      return <ViewFileSave kategori="task"/>
+
+   return <ViewCreateTaskDivision searchParams={searchParams} />
+}
+
+export default Page

src/app/(application)/(detail-division)/task/update/[id]/page.tsx

@@ -2,13 +2,13 @@ import { ViewUpdateProgressDivisionTask } from "@/module/division_new"
 import { DetailCreateUserProject, DetailDateEndTask, FileUploadProgres } from "@/module/project";
 
 function Page({ searchParams }: { searchParams: any }) {
-   if (searchParams.page == "upload-progres") return <FileUploadProgres />;
+   if (searchParams.page == "upload-progres") return <FileUploadProgres kategori="task" />;
    if (searchParams.page == "detail-create-user")
-      return <DetailCreateUserProject />;
+      return <DetailCreateUserProject kategori="task" />;
-   if (searchParams.page == "detail-date-task") return <DetailDateEndTask />;
+   if (searchParams.page == "detail-date-task") return <DetailDateEndTask kategori="task" />;
 
    return (
-      <ViewUpdateProgressDivisionTask searchParams={searchParams}/>
+      <ViewUpdateProgressDivisionTask searchParams={searchParams} />
    )
 }
 

src/app/(application)/project/create/page.tsx

@@ -3,11 +3,11 @@ import React from "react";
 
 function Page({ searchParams }: { searchParams: any }) {
   if (searchParams.page == "task")
-    return <ViewDateEndTask />;
+    return <ViewDateEndTask kategori="project" />;
   if (searchParams.page == "create-users")
-    return <CreateUsersProject />
+    return <CreateUsersProject kategori="project" />
   if (searchParams.page == "file-save")
-    return <ViewFileSave />
+    return <ViewFileSave kategori="project" />
 
   return <ViewCreateProject searchParams={searchParams} />;
 }

src/app/(application)/project/update/[id]/page.tsx

@@ -8,10 +8,10 @@ import {
 import React from "react";
 
 function Page({ searchParams }: { searchParams: any }) {
-  if (searchParams.page == "upload-progres") return <FileUploadProgres />;
+  if (searchParams.page == "upload-progres") return <FileUploadProgres kategori="project" />;
   if (searchParams.page == "detail-create-user")
-    return <DetailCreateUserProject />;
+    return <DetailCreateUserProject kategori="project" />;
-  if (searchParams.page == "detail-date-task") return <DetailDateEndTask />;
+  if (searchParams.page == "detail-date-task") return <DetailDateEndTask kategori="project" />;
 
   return <ViewUpdateProgres searchParams={searchParams} />;
 }

src/module/division_new/_division_fitur/task/component/create_task.tsx

@@ -0,0 +1,130 @@
+"use client";
+import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
+import { Box, Button, Center, Flex, Group, Input, Stack, Text } from "@mantine/core";
+import { useRouter } from "next/navigation";
+import React, { useState } from "react";
+import { IoIosArrowDropright } from "react-icons/io";
+import { BsFiletypeCsv } from "react-icons/bs";
+import ResultsDateAndTask from "@/module/project/components/results_date-and_task";
+import ResultsFile from "@/module/project/components/results_file";
+
+export default function CreateTask({ searchParams }: { searchParams: any }) {
+  const router = useRouter();
+  const [openDrawer, setOpenDrawer] = useState(false);
+  return (
+    <Box>
+      <LayoutNavbarNew back="" title="tambah tugas" menu />
+      <Box p={20}>
+        <Stack>
+          <Input
+            styles={{
+              input: {
+                border: `1px solid ${"#D6D8F6"}`,
+                borderRadius: 10,
+              },
+            }}
+            placeholder="Nama Proyek"
+            size="md"
+          />
+          <Box onClick={() => router.push("/task/create?page=task")}>
+            <Group
+              justify="space-between"
+              p={10}
+              style={{
+                border: `1px solid ${"#D6D8F6"}`,
+                borderRadius: 10,
+              }}
+            >
+              <Text>Tambah Tanggal & Tugas</Text>
+              <IoIosArrowDropright size={25} />
+            </Group>
+          </Box>
+          <Group
+            justify="space-between"
+            p={10}
+            style={{
+              border: `1px solid ${"#D6D8F6"}`,
+              borderRadius: 10,
+            }}
+            onClick={() => setOpenDrawer(true)}
+          >
+            <Text>Upload File</Text>
+            <IoIosArrowDropright size={25} />
+          </Group>
+        </Stack>
+        {
+          (searchParams.anggota == 'yes') &&
+          <>
+            <ResultsDateAndTask />
+          </>
+        }
+
+        {(searchParams.files == 'yes') &&
+          <>
+            <ResultsFile />
+          </>
+        }
+
+        {
+          (searchParams.button == 'yes') &&
+          <>
+            <Box mt="xl">
+              <Button color="white" bg={WARNA.biruTua} size="lg" radius={30} fullWidth onClick={() => router.push('/task')}>
+                Simpan
+              </Button>
+            </Box>
+          </>
+        }
+
+
+      </Box>
+
+
+
+      <LayoutDrawer
+        opened={openDrawer}
+        onClose={() => setOpenDrawer(false)}
+        title={"Pilih File"}
+      >
+        <Flex justify={"space-around"}>
+          <Box onClick={() => ""}>
+            <Box
+              bg={"#DCEED8"}
+              style={{
+                border: `1px solid ${"#D6D8F6"}`,
+                padding: 20,
+                borderRadius: 10,
+              }}
+            >
+              <Center>
+                <BsFiletypeCsv size={40} />
+              </Center>
+            </Box>
+            <Text mt={10} ta={"center"}>
+              Pilih file
+            </Text>
+            <Text ta={"center"}>diperangkat</Text>
+          </Box>
+          <Box onClick={() => router.push("/task/create?page=file-save")}>
+            <Box
+              bg={"#DCEED8"}
+              style={{
+                border: `1px solid ${"#D6D8F6"}`,
+                padding: 20,
+                borderRadius: 10,
+              }}
+            >
+              <Center>
+                <BsFiletypeCsv size={40} />
+              </Center>
+            </Box>
+            <Text mt={10} ta={"center"}>
+              Pilih file yang
+            </Text>
+            <Text ta={"center"}>sudah ada</Text>
+          </Box>
+        </Flex>
+      </LayoutDrawer>
+    </Box >
+  );
+}

src/module/division_new/_division_fitur/task/view/view_create_division_task.tsx

@@ -0,0 +1,7 @@
+import CreateTask from "../component/create_task";
+
+export default function ViewCreateTaskDivision({ searchParams }: { searchParams: any }) {
+   return (
+      <CreateTask searchParams={searchParams} />
+   );
+}

src/module/division_new/index.ts

@@ -1,5 +1,6 @@
 import ViewCreateDivisionCalender from "./_division_fitur/calender/view/view_create_division_calender";
 import ViewDivisionCalender from "./_division_fitur/calender/view/view_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";
 import ViewUpdateProgressDivisionTask from "./_division_fitur/task/view/view_update_progress_division_task";
@@ -21,3 +22,4 @@ export { ViewDetailDivisionTask }
 export { ViewUpdateProgressDivisionTask }
 export { ViewDivisionCalender }
 export { ViewCreateDivisionCalender }
+export { ViewCreateTaskDivision }

src/module/project/components/create_date_end_task.tsx

@@ -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>

src/module/project/components/create_users_project.tsx

@@ -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>

src/module/project/components/detail_project/detail_create_user_project.tsx

@@ -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>

src/module/project/components/detail_project/detail_date_end_task.tsx

@@ -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 />
+      <LayoutNavbarNew back="" title={"Tanggal Tugas"} menu />
-    <Box p={20}>
+      <Box p={20}>
-      <Group
+        <Group
-        justify="center"
+          justify="center"
-        bg={"white"}
+          bg={"white"}
-        py={20}
+          py={20}
-        style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
+          style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
-      >
+        >
-        <DatePicker
+          <DatePicker
-          styles={{}}
+            styles={{}}
-          type="range"
+            type="range"
-          value={value}
+            value={value}
-          onChange={setValue}
+            onChange={setValue}
-          size="md"
+            size="md"
-          c={WARNA.biruTua}
+            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>
         </Group>
-        <Box pt={10}>
+        <SimpleGrid cols={{ base: 2, sm: 2, lg: 2 }} mt={20}>
-          <Box mb={20}>
+          <Box>
-            <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"}>
+              <Text c={WARNA.biruTua}>Tambah Anggota</Text>
-                Divisi Kerohanian
+              <IoIosArrowDropright size={25} />
-              </Text>
+            </Group>
-              {dataTugas.map((v, i) => {
+          </Box>
-                return (
+        </Stack>
-                  <Flex
+        <Box pt={30}>
-                    justify={"space-between"}
+          <Group justify="space-between">
-                    align={"center"}
+            <Text c={WARNA.biruTua}>Anggota Terpilih</Text>
-                    mt={20}
+            <Text c={WARNA.biruTua}>Total 10 Anggota</Text>
-                    key={i}
+          </Group>
-                  >
+          <Box pt={10}>
-                    <Group>
+            <Box mb={20}>
-                      <Avatar src={v.image} alt="it's me" size="lg" />
+              <Box
-                      <Box>
+                style={{
-                        <Text c={WARNA.biruTua} fw={"bold"}>
+                  border: `1px solid ${"#C7D6E8"}`,
-                          {v.name}
+                  borderRadius: 10,
-                        </Text>
+                }}
-                        <Text c={"#5A687D"} fz={14}>
+                px={20}
-                          {v.email}
+                py={10}
-                        </Text>
+              >
-                      </Box>
+                <Text c={WARNA.biruTua} fw={"bold"}>
-                    </Group>
+                  Divisi Kerohanian
-                    <Text c={WARNA.biruTua} fw={"bold"}>
+                </Text>
-                      Anggota
+                {dataTugas.map((v, i) => {
-                    </Text>
+                  return (
-                  </Flex>
+                    <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"}>
-      <Box mt={"xl"}>
+          <Button
-        <Button
+            c={"white"}
-          c={"white"}
+            bg={WARNA.biruTua}
-          bg={WARNA.biruTua}
+            size="lg"
-          size="lg"
+            radius={30}
-          radius={30}
+            fullWidth
-          fullWidth
+            onClick={() => router.push(`/${kategori}/update/1?tugas=yes`)}
-          onClick={() => router.push('/project/update-detail?tugas=yes')}
+          >
-        >
+            Simpan
-          Simpan
+          </Button>
-        </Button>
+        </Box>
       </Box>
     </Box>
-  </Box>
   );
 }
 

src/module/project/components/detail_project/detail_project.tsx

@@ -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>

src/module/project/components/detail_project/file_upload_progres.tsx

@@ -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>

src/module/project/components/detail_project/update_progres.tsx

@@ -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

src/module/project/components/file_save.tsx

@@ -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>

src/module/project/view/view_file_save.tsx

@@ -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} />
   );
 }