wibu/sistem-desa-mandiri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #56 from bipproduction/amalia/17-jul-24

Browse Source 
Amalia/17 jul 24
This commit is contained in:
Amalia
2024-07-17 15:23:03 +08:00
committed by GitHub
parent 9dc86961be 8ac79cccb7
commit e813e8d015
17 changed files with 139 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
prisma/schema.prisma
View File

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

0
public/image/village/.gitkeep Normal file
View File

7
src/app/(application)/division/edit-anggota/[id]/page.tsx Normal file
View File

@@ -0,0 +1,7 @@
function Page() {
return (
<>Edit Anggota divisi</>
)
}
export default Page;

7
src/app/(application)/division/edit/[id]/page.tsx Normal file
View File

@@ -0,0 +1,7 @@
function Page() {
return (
<>Edit Divisi</>
)
}
export default Page

7
src/app/(application)/division/info/[id]/page.tsx Normal file
View File

@@ -0,0 +1,7 @@
function Page() {
return (
<>informasi divisi</>
)
}
export default Page;

7
src/app/(application)/division/report/[id]/page.tsx Normal file
View File

@@ -0,0 +1,7 @@
function Page() {
return (
<>Report divisi</>
)
}
export default Page

2
src/module/division_new/_division_fitur/calender/components/detail_event_division.tsx
View File

@@ -46,7 +46,7 @@ export default function DetailEventDivision() {
const [openDrawer, setOpenDrawer] = useState(false)
return (
<Box>
<LayoutNavbarNew back="/calender" title="Detail Event"
<LayoutNavbarNew back="" title="Detail Event"
menu={<ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
<HiMenu size={20} color='white' />
</ActionIcon>} />

6
src/module/division_new/components/detail_division/detail_division.tsx
View File

@@ -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 (
<Box>
<LayoutNavbarNew back="/division" title={"Divisi kerohanian"} menu />
<NavbarDetailDivision />
<Box p={20}>
<Stack>
<CarouselDivision />

2
src/module/division_new/components/detail_division/list_document.tsx
View File

@@ -55,7 +55,7 @@ export default function ListDocumentOnDetailDivision() {
</Center>
</Paper>
<Box p={"sm"}>
<Text c={"dimmed"}>{v.title}</Text>
<Text c={"dimmed"} truncate="end"ta={"center"}>{v.title}</Text>
</Box>
</Stack>
</UnstyledButton>

57
src/module/division_new/components/ui/drawer_detail_division.tsx Normal file
View File

@@ -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 (
<Box>
<Stack pt={10}>
<SimpleGrid
cols={{ base: 3, sm: 3, lg: 3 }}
>
<Flex onClick={() => router.push('/division/info/1')} justify={'center'} align={'center'} direction={'column'} >
<Box>
<BsInfoCircle size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua}>Informasi Divisi</Text>
</Box>
</Flex>
<Flex onClick={() => {
router.push('/division/edit/1')
}} justify={'center'} align={'center'} direction={'column'} >
<Box>
<FaPencil size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua}>Edit Divisi</Text>
</Box>
</Flex>
<Flex onClick={() => {
router.push('/division/edit-anggota/1')
}} justify={'center'} align={'center'} direction={'column'} >
<Box>
<TbReportAnalytics size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua}>Edit Anggota</Text>
</Box>
</Flex>
<Flex onClick={() => {
router.push('/division/report/1')
}} justify={'center'} align={'center'} direction={'column'} >
<Box>
<TbReportAnalytics size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua}>Report Divisi</Text>
</Box>
</Flex>
</SimpleGrid>
</Stack>
</Box>
);
}

2
src/module/division_new/components/ui/drawer_division.tsx
View File

@@ -20,7 +20,7 @@ export default function DrawerDivision() {
<IoAddCircle size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua}>Tambah Proyek</Text>
<Text c={WARNA.biruTua}>Tambah Divisi</Text>
</Box>
</Flex>
<Flex onClick={() => {

24
src/module/division_new/components/ui/navbar_detail_division.tsx Normal file
View File

@@ -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 (
<Box>
<LayoutNavbarNew back="" title={"Divisi kerohanian"} menu={
<ActionIcon variant="light" onClick={() => (setOpenDrawer(true))} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
<HiMenu size={20} color='white' />
</ActionIcon>
} />
<LayoutDrawer opened={openDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>
<DrawerDetailDivision />
</LayoutDrawer>
</Box>
);
}

2
src/module/home/components/chart_progress_tugas.tsx
View File

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

6
src/module/home/components/list_discussion.tsx
View File

@@ -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 (
<Box pt={10}>
<Text c={WARNA.biruTua} mb={10} fw={'bold'} fz={16}>Diskusi</Text>
@@ -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`)}>
<Group>
<GoDiscussionClosed size={25} />
<Box w={{ base: 230, md: 400 }}>

4
src/module/home/components/list_divisi.tsx
View File

@@ -28,12 +28,12 @@ export default function ListDivisi() {
return (
<>
<Box pt={10}>
<Text c={WARNA.biruTua} mb={10} fw={'bold'} fz={16}>Divisi Terbaru</Text>
<Text c={WARNA.biruTua} mb={10} fw={'bold'} fz={16}>Divisi Teraktif</Text>
<Carousel dragFree slideGap={"xs"} align="start" slideSize={"xs"} withIndicators withControls={false}>
{dataProject.map((v) =>
<Carousel.Slide key={v.id}>
<Box w={{ base: 300, md: 400 }}>
<Card shadow="sm" padding="md" component="a" radius={10}>
<Card shadow="sm" padding="md" component="a" radius={10} onClick={() => router.push(`/division/${v.id}`)}>
<Card.Section>
<Box h={120} bg={`linear-gradient(180deg, rgba(223,218,124,1) 25%, rgba(242,175,70,1) 100%)`}>
<Flex justify={'center'} align={'center'} h={"100%"}>

7
src/module/home/components/list_event.tsx
View File

@@ -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 (
<Box pt={10}>
<Text c={WARNA.biruTua} mb={10} fw={'bold'} fz={16}>Event Hari Ini</Text>
@@ -45,7 +48,7 @@ export default function ListEventHome() {
const bgColor = ['#D8D8F1', '#FED6C5'][index % 2]
const colorDivider = ['#535FCA', '#A7A7A7'][index % 2]
return (
<Box key={event.id} m={10}>
<Box key={event.id} m={10} onClick={() => router.push(`/calender?page=detail-event`)}>
<Box bg={bgColor} pl={15} p={10} style={{
borderRadius: 10
}} h={113}>
@@ -53,7 +56,7 @@ export default function ListEventHome() {
<Divider h={92} size="lg" orientation="vertical" color={colorDivider} />
<Box>
<Text>{event.jamAwal} - {event.jamAkhir}</Text>
<Text fw={"bold"}>{event.title}</Text>
<Text fw={"bold"} truncate="end">{event.title}</Text>
<Text>Dibuat oleh : {event.dibuat}</Text>
</Box>
</Group>

2
src/module/project/components/detail_project/detail_project.tsx
View File

@@ -60,7 +60,7 @@ export default function DetailProject() {
return (
<Box>
<LayoutNavbarNew
back="/project"
back=""
title="Proyek Desa Maju"
menu={
<ActionIcon