Merge pull request #155 from bipproduction/amalia/28-agustus-24

Amalia/28 agustus 24
This commit is contained in:
Amalia
2024-08-28 14:41:03 +08:00
committed by GitHub
63 changed files with 197 additions and 1666 deletions

View File

@@ -1,11 +0,0 @@
import { Box } from '@mantine/core';
import React from 'react';
import NavbarCreateUserCalender from './navbar_create_user_calender';
export default function CreateUserDivisionCalender() {
return (
<Box>
<NavbarCreateUserCalender />
</Box>
);
}

View File

@@ -1,67 +0,0 @@
"use client"
import { WARNA } from '@/module/_global';
import { Box, Button, Checkbox } from '@mantine/core';
import { useRouter } from 'next/navigation';
import React from 'react';
const dataUlangi = [
{
id: 1,
name: 'Acara 1 Kali'
},
{
id: 2,
name: 'Hari Kerja (Sen - Jum)'
},
{
id: 3,
name: 'Mingguan'
},
{
id: 4,
name: 'Bulanan'
},
{
id: 5,
name: 'Tahunan'
},
]
export default function ListUlangiEvent() {
const router = useRouter()
return (
<Box>
{dataUlangi.map((v, i) => {
return (
<Box key={i} mb={20}>
<Box style={{
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
padding: 20
}}
>
<Checkbox
label={v.name}
color="teal"
radius="xl"
/>
</Box>
</Box>
)
})}
<Box mt={"xl"}>
<Button
c={"white"}
bg={WARNA.biruTua}
size="lg"
radius={30}
fullWidth
onClick={() => router.push(``)}
>
Simpan
</Button>
</Box>
</Box>
);
}

View File

@@ -1,119 +0,0 @@
'use client'
import { LayoutNavbarNew, WARNA } from '@/module/_global';
import LayoutModal from '@/module/_global/layout/layout_modal';
import { Avatar, Box, Button, Center, SimpleGrid, Stack, Text, TextInput } from '@mantine/core';
import { useRouter } from 'next/navigation';
import React, { useState } from 'react';
import toast from 'react-hot-toast';
import { HiMagnifyingGlass } from 'react-icons/hi2';
const dataUser = [
{
id: 1,
img: "https://i.pravatar.cc/500?img=3",
name: "Doni Setiawan",
},
{
id: 2,
img: "https://i.pravatar.cc/500?img=10",
name: "Ilham Udin",
},
{
id: 3,
img: "https://i.pravatar.cc/500?img=11",
name: "Didin Anang",
},
{
id: 4,
img: "https://i.pravatar.cc/500?img=1",
name: "Angga Saputra",
},
{
id: 5,
img: "https://i.pravatar.cc/500?img=2",
name: "Marcel Widianto",
},
{
id: 6,
img: "https://i.pravatar.cc/500?img=7",
name: "Bagas Nusantara",
},
];
export default function NavbarCreateUserCalender() {
const router = useRouter()
const [selectedFiles, setSelectedFiles] = useState<Record<number, boolean>>({});
const handleFileClick = (index: number) => {
setSelectedFiles((prevSelectedFiles) => ({
...prevSelectedFiles,
[index]: !prevSelectedFiles[index],
}));
};
return (
<Box>
<LayoutNavbarNew back="/calender/create" title="Tambah Anggota" menu />
<Box p={20}>
<Stack>
<TextInput
styles={{
input: {
color: WARNA.biruTua,
borderRadius: '#A3A3A3',
borderColor: '#A3A3A3',
},
}}
size="md"
radius={30}
leftSection={<HiMagnifyingGlass size={20} />}
placeholder="Pencarian"
/>
<Box pt={10}>
<SimpleGrid
cols={{ base: 2, sm: 2, lg: 2 }}
spacing={{ base: 20, sm: "xl" }}
verticalSpacing={{ base: "md", sm: "xl" }}
>
{dataUser.map((v, index) => {
const isSelected = selectedFiles[index];
return (
<Box key={index} mb={10}>
<Box
bg={isSelected ? WARNA.bgHijauMuda : "white"}
style={{
border: `1px solid ${WARNA.biruTua}`,
borderRadius: 20,
}}
py={10}
onClick={() => handleFileClick(index)}
>
<Center>
<Avatar src={v.img} alt="it's me" size="xl" />
</Center>
<Text mt={20} ta="center">
{v.name}
</Text>
</Box>
</Box>
);
})}
</SimpleGrid>
</Box>
</Stack>
<Box mt="xl">
<Button
color="white"
bg={WARNA.biruTua}
size="lg"
radius={30}
fullWidth
onClick={() => router.push("/calender/create")}
>
Simpan
</Button>
</Box>
</Box>
</Box>
);
}

View File

@@ -1,15 +0,0 @@
import { LayoutNavbarNew } from '@/module/_global';
import { ActionIcon, Box } from '@mantine/core';
import React from 'react';
import ListUlangiEvent from './list_ulangi_event';
export default function UlangiEvent() {
return (
<Box>
<LayoutNavbarNew back='/calender/create' title='ulangi event' menu />
<Box p={20}>
<ListUlangiEvent />
</Box>
</Box>
);
}

View File

@@ -1,9 +0,0 @@
import React from 'react';
import CreateCalenderDivisionCaleder from '../../../../calender/ui/create_calender_division_caleder';
export default function ViewCreateDivisionCalender() {
return (
<CreateCalenderDivisionCaleder />
);
}

View File

@@ -1,9 +0,0 @@
import React from 'react';
import DetailEventDivision from '../../../../calender/ui/detail_event_division';
export default function ViewDetailEventDivision() {
return (
<DetailEventDivision />
);
}

View File

@@ -1,12 +0,0 @@
import React from 'react';
import NavbarDivisionCalender from '../../../../calender/ui/navbar_division_calender';
import { Box } from '@mantine/core';
export default function ViewDivisionCalender() {
return (
<Box>
<NavbarDivisionCalender />
</Box>
);
}

View File

@@ -1,12 +0,0 @@
import { Box } from '@mantine/core';
import React from 'react';
import HistoryDivisionCalender from '../../../../calender/ui/history_division_calender';
export default function ViewHistoryDivisionCalender() {
return (
<Box>
<HistoryDivisionCalender />
</Box>
);
}

View File

@@ -1,9 +1,4 @@
import { IFormDivision, IFormMemberDivision, IFormFixDivision, IDataDivison, IDataMemberDivision } from './lib/type_division';
import CreateUserDivisionCalender from "./_division_fitur/calender/components/create_user_division_calender";
import ViewCreateDivisionCalender from "./_division_fitur/calender/view/view_create_division_calender";
import ViewDetailEventDivision from "./_division_fitur/calender/view/view_detail_event_division";
import ViewDivisionCalender from "./_division_fitur/calender/view/view_division_calender";
import ViewHistoryDivisionCalender from "./_division_fitur/calender/view/view_history_division_calender";
import CreateAdminDivision from "./ui/create_admin_division";
import CreateUsers from "./ui/create_users";
import ListDivision from './ui/list_division';
@@ -20,15 +15,9 @@ import EditDivision from './ui/edit_division';
import CreateReport from './ui/create_report';
import ReportDivisionId from './ui/report_division_id';
import { funGetDivisionById, funGetListDivisionByIdDivision } from './lib/api_division';
import UlangiEvent from './_division_fitur/calender/components/ulangi_event';
export { CreateUsers };
export { CreateAdminDivision };
export { ViewDivisionCalender };
export { ViewCreateDivisionCalender };
export { CreateUserDivisionCalender };
export { ViewHistoryDivisionCalender };
export { ViewDetailEventDivision };
export type { IFormDivision, IFormMemberDivision, IFormFixDivision, IDataDivison, IDataMemberDivision }
export { ListDivision }
export { CreateDivision }
@@ -45,4 +34,3 @@ export { CreateReport }
export { ReportDivisionId }
export { funGetDivisionById }
export { funGetListDivisionByIdDivision }
export { UlangiEvent }

File diff suppressed because one or more lines are too long

View File

@@ -10,32 +10,6 @@ import { GoDiscussionClosed } from "react-icons/go";
import { funGetDetailDivisionById } from "../lib/api_division";
import { IDataDiscussionOnDetailDivision } from "../lib/type_division";
const dataDiskusi = [
{
id: 1,
judul: "Mengatasi Limbah Makanan ",
user: "Fibra Marcell",
date: "21 Juni 2024",
},
{
id: 2,
judul: "Pentingnya Menjaga Kelestarian Hutan ",
user: "Bayu Tegar",
date: "15 Juni 2024",
},
{
id: 3,
judul: "Mengatasi Limbah Industri ",
user: "Nian Putri",
date: "11 Mei 2024",
},
{
id: 4,
judul: "Manfaat Sampah Plastik",
user: "Budi Prasetyo",
date: "10 Mei 2024",
},
];
export default function ListDiscussionOnDetailDivision() {
const router = useRouter();
@@ -110,7 +84,7 @@ export default function ListDiscussionOnDetailDivision() {
padding: 10,
}}
mb={10}
onClick={() => router.push(`/discussion/${v.id}`)}
onClick={() => router.push(`${param.id}/discussion/${v.id}`)}
>
<Group>
<GoDiscussionClosed size={25} />

View File

@@ -2,7 +2,7 @@
import { WARNA } from "@/module/_global";
import { Carousel } from "@mantine/carousel";
import { Box, Image, Text, Center, Paper, Stack, UnstyledButton, Skeleton, Group } from "@mantine/core";
import * as ICON from '../../division/lib/file_icon'
import * as ICON from '../lib/file_icon'
import { useParams, useRouter } from "next/navigation";
import { useShallowEffect } from "@mantine/hooks";
import toast from "react-hot-toast";