From d54a6cfb093179a1975074af7c8eaec12595e986 Mon Sep 17 00:00:00 2001 From: amel Date: Wed, 17 Jul 2024 13:41:37 +0800 Subject: [PATCH 1/3] upd: fix tulisan panjang Deskripsi: - menggunakan truncate pda beberapa text No Issues --- .../division_new/components/detail_division/list_discussion.tsx | 2 +- .../division_new/components/detail_division/list_document.tsx | 2 +- .../division_new/components/detail_division/list_task.tsx | 2 +- src/module/home/components/list_discussion.tsx | 2 +- src/module/home/components/list_event.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/module/division_new/components/detail_division/list_discussion.tsx b/src/module/division_new/components/detail_division/list_discussion.tsx index 1b5969e..f4485dd 100644 --- a/src/module/division_new/components/detail_division/list_discussion.tsx +++ b/src/module/division_new/components/detail_division/list_discussion.tsx @@ -52,7 +52,7 @@ export default function ListDiscussionOnDetailDivision() { - {v.judul} + {v.judul} diff --git a/src/module/division_new/components/detail_division/list_document.tsx b/src/module/division_new/components/detail_division/list_document.tsx index d710c9d..c1456cc 100644 --- a/src/module/division_new/components/detail_division/list_document.tsx +++ b/src/module/division_new/components/detail_division/list_document.tsx @@ -55,7 +55,7 @@ export default function ListDocumentOnDetailDivision() { - {v.title} + {v.title} diff --git a/src/module/division_new/components/detail_division/list_task.tsx b/src/module/division_new/components/detail_division/list_task.tsx index f427682..ddcf318 100644 --- a/src/module/division_new/components/detail_division/list_task.tsx +++ b/src/module/division_new/components/detail_division/list_task.tsx @@ -40,7 +40,7 @@ export default function ListTaskOnDetailDivision() { {dataTask.map((v, i) => - {v.title} + {v.title} diff --git a/src/module/home/components/list_discussion.tsx b/src/module/home/components/list_discussion.tsx index b6b5d32..51ff103 100644 --- a/src/module/home/components/list_discussion.tsx +++ b/src/module/home/components/list_discussion.tsx @@ -50,7 +50,7 @@ export default function ListDiscussion() { - {v.judul} + {v.judul} diff --git a/src/module/home/components/list_event.tsx b/src/module/home/components/list_event.tsx index c207093..e4fad7a 100644 --- a/src/module/home/components/list_event.tsx +++ b/src/module/home/components/list_event.tsx @@ -53,7 +53,7 @@ export default function ListEventHome() { {event.jamAwal} - {event.jamAkhir} - {event.title} + {event.title} Dibuat oleh : {event.dibuat} From 41f5c95847cf53afea0a740ff87c8f51f7edfe25 Mon Sep 17 00:00:00 2001 From: amel Date: Wed, 17 Jul 2024 15:19:56 +0800 Subject: [PATCH 2/3] upd: view Deksirpsi: - tambah table database - folder penyimpanan gambar - link back - link list pada halaman home No Issues --- prisma/schema.prisma | 10 ++++++++++ public/image/village/.gitkeep | 0 src/module/home/components/chart_progress_tugas.tsx | 2 +- src/module/home/components/list_discussion.tsx | 6 +++++- src/module/home/components/list_divisi.tsx | 4 ++-- src/module/home/components/list_event.tsx | 5 ++++- .../components/detail_project/detail_project.tsx | 2 +- 7 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 public/image/village/.gitkeep diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 06627ab..dd13d6e 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -362,3 +362,13 @@ model DivisionCalendarReminder { createdAt DateTime @default(now()) updatedAt DateTime @updatedAt } + +model ContainerImage { + id String @id @default(cuid()) + category String + idCategory String + extension String + isActive Boolean @default(true) + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt +} diff --git a/public/image/village/.gitkeep b/public/image/village/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/module/home/components/chart_progress_tugas.tsx b/src/module/home/components/chart_progress_tugas.tsx index dbbdc6c..71da00a 100644 --- a/src/module/home/components/chart_progress_tugas.tsx +++ b/src/module/home/components/chart_progress_tugas.tsx @@ -16,7 +16,7 @@ export default function ChartProgressHome() { const loadData = () => { const option: EChartsOption = { title: { - text: "PROGRES TUGAS", + text: "PROGRES PROYEK", top: '2%', left: 'center', textStyle: { diff --git a/src/module/home/components/list_discussion.tsx b/src/module/home/components/list_discussion.tsx index 51ff103..a665cb9 100644 --- a/src/module/home/components/list_discussion.tsx +++ b/src/module/home/components/list_discussion.tsx @@ -1,7 +1,9 @@ +'use client' import { WARNA } from "@/module/_global"; import { Box, Group, Text } from "@mantine/core"; import { GoDiscussionClosed } from "react-icons/go"; import { CiClock2, CiUser } from "react-icons/ci"; +import { useRouter } from "next/navigation"; const dataDiskusi = [ { @@ -31,6 +33,8 @@ const dataDiskusi = [ ] export default function ListDiscussion() { + const router = useRouter() + return ( Diskusi @@ -46,7 +50,7 @@ export default function ListDiscussion() { borderRadius: 10, border: `1px solid ${"#D6D8F6"}`, padding: 10 - }} mb={10}> + }} mb={10} onClick={() => router.push(`/discussion/1`)}> diff --git a/src/module/home/components/list_divisi.tsx b/src/module/home/components/list_divisi.tsx index 66e1bb4..59780ad 100644 --- a/src/module/home/components/list_divisi.tsx +++ b/src/module/home/components/list_divisi.tsx @@ -28,12 +28,12 @@ export default function ListDivisi() { return ( <> - Divisi Terbaru + Divisi Teraktif {dataProject.map((v) => - + router.push(`/division/${v.id}`)}> diff --git a/src/module/home/components/list_event.tsx b/src/module/home/components/list_event.tsx index e4fad7a..08dbff4 100644 --- a/src/module/home/components/list_event.tsx +++ b/src/module/home/components/list_event.tsx @@ -1,5 +1,7 @@ +'use client' import { WARNA } from "@/module/_global" import { Box, Divider, Group, Text } from "@mantine/core" +import { useRouter } from "next/navigation" const dataEvent = [ { @@ -33,6 +35,7 @@ const dataEvent = [ ] export default function ListEventHome() { + const router = useRouter() return ( Event Hari Ini @@ -45,7 +48,7 @@ export default function ListEventHome() { const bgColor = ['#D8D8F1', '#FED6C5'][index % 2] const colorDivider = ['#535FCA', '#A7A7A7'][index % 2] return ( - + router.push(`/calender?page=detail-event`)}> diff --git a/src/module/project/components/detail_project/detail_project.tsx b/src/module/project/components/detail_project/detail_project.tsx index 6e0837f..b7d81f1 100644 --- a/src/module/project/components/detail_project/detail_project.tsx +++ b/src/module/project/components/detail_project/detail_project.tsx @@ -60,7 +60,7 @@ export default function DetailProject() { return ( Date: Wed, 17 Jul 2024 15:21:19 +0800 Subject: [PATCH 3/3] upd: divisi Deskripsi: - edit divisi - info divisi - edit anggota divisi - report divisi - navbar detail divisi No Issues --- .../division/edit-anggota/[id]/page.tsx | 7 +++ .../(application)/division/edit/[id]/page.tsx | 7 +++ .../(application)/division/info/[id]/page.tsx | 7 +++ .../division/report/[id]/page.tsx | 7 +++ .../components/detail_event_division.tsx | 2 +- .../detail_division/detail_division.tsx | 6 +- .../components/ui/drawer_detail_division.tsx | 57 +++++++++++++++++++ .../components/ui/drawer_division.tsx | 2 +- .../components/ui/navbar_detail_division.tsx | 24 ++++++++ 9 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 src/app/(application)/division/edit-anggota/[id]/page.tsx create mode 100644 src/app/(application)/division/edit/[id]/page.tsx create mode 100644 src/app/(application)/division/info/[id]/page.tsx create mode 100644 src/app/(application)/division/report/[id]/page.tsx create mode 100644 src/module/division_new/components/ui/drawer_detail_division.tsx create mode 100644 src/module/division_new/components/ui/navbar_detail_division.tsx diff --git a/src/app/(application)/division/edit-anggota/[id]/page.tsx b/src/app/(application)/division/edit-anggota/[id]/page.tsx new file mode 100644 index 0000000..c75333d --- /dev/null +++ b/src/app/(application)/division/edit-anggota/[id]/page.tsx @@ -0,0 +1,7 @@ +function Page() { + return ( + <>Edit Anggota divisi + ) +} + +export default Page; \ No newline at end of file diff --git a/src/app/(application)/division/edit/[id]/page.tsx b/src/app/(application)/division/edit/[id]/page.tsx new file mode 100644 index 0000000..fd35d91 --- /dev/null +++ b/src/app/(application)/division/edit/[id]/page.tsx @@ -0,0 +1,7 @@ +function Page() { + return ( + <>Edit Divisi + ) +} + +export default Page \ No newline at end of file diff --git a/src/app/(application)/division/info/[id]/page.tsx b/src/app/(application)/division/info/[id]/page.tsx new file mode 100644 index 0000000..1819638 --- /dev/null +++ b/src/app/(application)/division/info/[id]/page.tsx @@ -0,0 +1,7 @@ +function Page() { + return ( + <>informasi divisi + ) +} + +export default Page; \ No newline at end of file diff --git a/src/app/(application)/division/report/[id]/page.tsx b/src/app/(application)/division/report/[id]/page.tsx new file mode 100644 index 0000000..90b0491 --- /dev/null +++ b/src/app/(application)/division/report/[id]/page.tsx @@ -0,0 +1,7 @@ +function Page() { + return ( + <>Report divisi + ) +} + +export default Page \ No newline at end of file diff --git a/src/module/division_new/_division_fitur/calender/components/detail_event_division.tsx b/src/module/division_new/_division_fitur/calender/components/detail_event_division.tsx index 88f65b7..08dbbb8 100644 --- a/src/module/division_new/_division_fitur/calender/components/detail_event_division.tsx +++ b/src/module/division_new/_division_fitur/calender/components/detail_event_division.tsx @@ -46,7 +46,7 @@ export default function DetailEventDivision() { const [openDrawer, setOpenDrawer] = useState(false) return ( - setOpenDrawer(true)} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings"> } /> diff --git a/src/module/division_new/components/detail_division/detail_division.tsx b/src/module/division_new/components/detail_division/detail_division.tsx index f668359..e448eb2 100644 --- a/src/module/division_new/components/detail_division/detail_division.tsx +++ b/src/module/division_new/components/detail_division/detail_division.tsx @@ -1,16 +1,16 @@ -import { Box, Stack } from '@mantine/core'; +import { ActionIcon, Box, Stack } from '@mantine/core'; import React from 'react'; import CarouselDivision from './carousel_division'; -import { LayoutNavbarNew } from '@/module/_global'; import FeatureDetailDivision from './feature_detail_division'; import ListDiscussionOnDetailDivision from './list_discussion'; import ListTaskOnDetailDivision from './list_task'; import ListDocumentOnDetailDivision from './list_document'; +import NavbarDetailDivision from '../ui/navbar_detail_division'; export default function DetailDivision() { return ( - + diff --git a/src/module/division_new/components/ui/drawer_detail_division.tsx b/src/module/division_new/components/ui/drawer_detail_division.tsx new file mode 100644 index 0000000..f5e5dfc --- /dev/null +++ b/src/module/division_new/components/ui/drawer_detail_division.tsx @@ -0,0 +1,57 @@ +import { WARNA } from "@/module/_global"; +import { Box, Stack, SimpleGrid, Flex, Text } from "@mantine/core"; +import router from "next/router"; +import { BsInfoCircle } from "react-icons/bs"; +import { FaPencil } from "react-icons/fa6"; +import { TbReportAnalytics } from "react-icons/tb"; + +export default function DrawerDetailDivision() { + return ( + + + + router.push('/division/info/1')} justify={'center'} align={'center'} direction={'column'} > + + + + + Informasi Divisi + + + { + router.push('/division/edit/1') + }} justify={'center'} align={'center'} direction={'column'} > + + + + + Edit Divisi + + + { + router.push('/division/edit-anggota/1') + }} justify={'center'} align={'center'} direction={'column'} > + + + + + Edit Anggota + + + { + router.push('/division/report/1') + }} justify={'center'} align={'center'} direction={'column'} > + + + + + Report Divisi + + + + + + ); +} \ No newline at end of file diff --git a/src/module/division_new/components/ui/drawer_division.tsx b/src/module/division_new/components/ui/drawer_division.tsx index dc2bf74..fe7a903 100644 --- a/src/module/division_new/components/ui/drawer_division.tsx +++ b/src/module/division_new/components/ui/drawer_division.tsx @@ -20,7 +20,7 @@ export default function DrawerDivision() { - Tambah Proyek + Tambah Divisi { diff --git a/src/module/division_new/components/ui/navbar_detail_division.tsx b/src/module/division_new/components/ui/navbar_detail_division.tsx new file mode 100644 index 0000000..02b5f1c --- /dev/null +++ b/src/module/division_new/components/ui/navbar_detail_division.tsx @@ -0,0 +1,24 @@ +'use client' +import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global"; +import { ActionIcon, Box } from "@mantine/core"; +import { useState } from "react"; +import { HiMenu } from "react-icons/hi"; +import DrawerDetailDivision from "./drawer_detail_division"; + +export default function NavbarDetailDivision() { + const [openDrawer, setOpenDrawer] = useState(false) + return ( + + (setOpenDrawer(true))} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings"> + + + } /> + setOpenDrawer(false)}> + + + + + + ); +} \ No newline at end of file