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

Merge pull request #387 from bipproduction/join

Browse Source 
Join
This commit is contained in:
Amalia
2025-01-24 10:43:31 +08:00
committed by GitHub
parent 9e5f659563 70f2304ff2
commit b729003268
16 changed files with 91 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bun.lockb
View File

Binary file not shown.

1
package.json
View File

@@ -53,6 +53,7 @@
"readdirp": "^3.6.0",
"recharts": "2",
"rrule": "^2.8.1",
"sharp": "^0.33.5",
"supabase": "^1.192.5",
"web-push": "^3.6.7",
"wibu-cli": "^1.0.91",

20
src/app/api/user/[id]/route.ts
View File

@@ -3,6 +3,7 @@ import { funGetUserByCookies } from "@/module/auth";
import { createLogUser } from "@/module/user";
import _ from "lodash";
import { NextResponse } from "next/server";
import sharp from "sharp";
// GET ONE MEMBER / USER
export async function GET(request: Request, context: { params: { id: string } }) {
@@ -207,9 +208,24 @@ export async function PUT(request: Request, context: { params: { id: string } })
if (String(file) != "undefined" && String(file) != "null") {
const fExt = file.name.split(".").pop()
const fileName = id + '.' + fExt;
const newFile = new File([file], fileName, { type: file.type });
// Resize ukuran
const imageBuffer = await file.arrayBuffer();
const resize = await sharp(imageBuffer).resize(300).toBuffer();
// Convert buffer ke Blob
const blob = new Blob([resize], { type: file.type });
// Convert Blob ke File
const resizedFile = new File([blob], fileName, {
type: file.type,
lastModified: new Date().getTime(),
});
// const newFile = new File([file], fileName, { type: file.type });
await funDeleteFile({ fileId: String(updates.img) })
const upload = await funUploadFile({ file: newFile, dirId: DIR.user })
const upload = await funUploadFile({ file: resizedFile, dirId: DIR.user })
await prisma.user.update({
where: {
id: id

20
src/app/api/user/profile/route.ts
View File

@@ -3,6 +3,7 @@ import { funGetUserByCookies } from "@/module/auth";
import { createLogUser } from "@/module/user";
import _ from "lodash";
import { NextResponse } from "next/server";
import sharp from "sharp";
// GET PROFILE BY COOKIES
@@ -119,9 +120,24 @@ export async function PUT(request: Request) {
if (String(file) != "undefined" && String(file) != "null") {
const fExt = file.name.split(".").pop()
const fileName = user.id + '.' + fExt;
const newFile = new File([file], fileName, { type: file.type });
// Resize ukuran
const imageBuffer = await file.arrayBuffer();
const resize = await sharp(imageBuffer).resize(300).toBuffer();
// Convert buffer ke Blob
const blob = new Blob([resize], { type: file.type });
// Convert Blob ke File
const resizedFile = new File([blob], fileName, {
type: file.type,
lastModified: new Date().getTime(),
});
// const newFile = new File([file], fileName, { type: file.type });
await funDeleteFile({ fileId: String(update.img) })
const upload = await funUploadFile({ file: newFile, dirId: DIR.user })
const upload = await funUploadFile({ file: resizedFile, dirId: DIR.user })
if (upload.success) {
await prisma.user.update({
where: {

20
src/app/api/user/route.ts
View File

@@ -3,6 +3,7 @@ import { funGetUserByCookies } from "@/module/auth";
import { createLogUser } from "@/module/user";
import _ from "lodash";
import { NextResponse } from "next/server";
import sharp from "sharp";
// GET ALL MEMBER / USER
export async function GET(request: Request) {
@@ -194,8 +195,23 @@ export async function POST(request: Request) {
const fExt = file.name.split(".").pop()
const fileName = user.id + '.' + fExt;
const newFile = new File([file], fileName, { type: file.type });
const upload = await funUploadFile({ file: newFile, dirId: DIR.user })
// Resize ukuran
const imageBuffer = await file.arrayBuffer();
const resize = await sharp(imageBuffer).resize(300).toBuffer();
// Convert buffer ke Blob
const blob = new Blob([resize], { type: file.type });
// Convert Blob ke File
const resizedFile = new File([blob], fileName, {
type: file.type,
lastModified: new Date().getTime(),
});
// const newFile = new File([file], fileName, { type: file.type });
const upload = await funUploadFile({ file: resizedFile, dirId: DIR.user })
if (upload.success) {
await prisma.user.update({
where: {

2
src/app/api/version-app/route.ts
View File

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
export async function GET(request: Request) {
try {
return NextResponse.json({ success: true, version: "1.1.2", tahap: "beta", update:"-pdf viewer new -jumlah anggota pada grid list divisi" }, { status: 200 });
return NextResponse.json({ success: true, version: "1.1.4", tahap: "beta", update:"-resize profile image user (create anggota, edit anggota, edit profile) -menghilangkan image extensi heic" }, { status: 200 });
} catch (error) {
console.error(error);
return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });

28
src/module/banner/ui/create_banner.tsx
View File

@@ -120,9 +120,9 @@ function CreateBanner() {
}}
activateOnClick={false}
maxSize={10 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic']}
accept={['image/png', 'image/jpeg']}
onReject={(files) => {
return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB')
return toast.error('File yang diizinkan: .png dan .jpg dengan ukuran maksimal 10 MB')
}}
onClick={() => openRef.current?.()}
>
@@ -159,17 +159,17 @@ function CreateBanner() {
</Dropzone.Idle>
<div >
<Text size="xl" inline>
<Text size="xl" inline>
Klik Untuk Upload Image
</Text>
<Text mb={2} size="sm" c="dimmed" inline mt={7}>
Mohon unggah gambar dalam resolusi
Mohon unggah gambar dalam resolusi
</Text>
<Text mb={2} size='sm' c={"dimmed"} inline>
1535 x 450 piksel untuk memastikan
1535 x 450 piksel untuk memastikan
</Text>
<Text size='sm' c={"dimmed"} inline>
tampilan sesuai dengan kebutuhan desain.
tampilan sesuai dengan kebutuhan desain.
</Text>
</div>
</Group>
@@ -177,15 +177,15 @@ function CreateBanner() {
</Dropzone>
</Paper>
<Box mt={10}>
{touched.image && !imgForm && (
<Text size='sm' c={'red'}>
Silahkan Pilih Gambar
</Text>
)}
</Box>
<Box mt={10}>
{touched.image && !imgForm && (
<Text size='sm' c={'red'}>
Silahkan Pilih Gambar
</Text>
)}
</Box>
<Box>
<TextInput
<TextInput
mt={10}
label="Judul Banner"
placeholder='Judul Banner'

8
src/module/banner/ui/edit_banner.tsx
View File

@@ -56,8 +56,8 @@ export default function EditBanner() {
return false
setModal(true)
}
async function getOneData() {
try {
const res = await funGetOneBanner(param.id)
@@ -121,9 +121,9 @@ export default function EditBanner() {
}}
activateOnClick={false}
maxSize={10 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic']}
accept={['image/png', 'image/jpeg']}
onReject={(files) => {
return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB')
return toast.error('File yang diizinkan: .png dan .jpg dengan ukuran maksimal 10 MB')
}}
onClick={() => openRef.current?.()}
>

4
src/module/document/ui/drawer_menu_document_division.tsx
View File

@@ -149,12 +149,12 @@ export default function DrawerMenuDocumentDivision() {
}}
activateOnClick={false}
maxSize={100 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
accept={['image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
onReject={(files) => {
refresh.set(true)
setOpenModal(false)
setOpenDrawerDocument(false)
toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
toast.error('File yang diizinkan: .csv, .png, .jpg, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
}}
>
<Flex justify={'center'} align={'center'} direction={'column'} mb={20} onClick={() => openRef.current?.()}>

4
src/module/project/ui/add_file_detail_project.tsx
View File

@@ -106,9 +106,9 @@ export default function AddFileDetailProject() {
}}
activateOnClick={false}
maxSize={100 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
accept={['image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
onReject={(files) => {
return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
return toast.error('File yang diizinkan: .csv, .png, .jpg, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
}}
>
</Dropzone>

6
src/module/project/ui/create_project.tsx
View File

@@ -200,7 +200,7 @@ export default function CreateProject() {
label="Grup"
size="md"
styles={{
input: {
input: {
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
},
@@ -413,9 +413,9 @@ export default function CreateProject() {
}}
activateOnClick={false}
maxSize={100 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
accept={['image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
onReject={(files) => {
return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
return toast.error('File yang diizinkan: .csv, .png, .jpg, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
}}
></Dropzone>

4
src/module/task/ui/add_file_detail_task.tsx
View File

@@ -107,9 +107,9 @@ export default function AddFileDetailTask() {
}}
activateOnClick={false}
maxSize={100 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
accept={['image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
onReject={(files) => {
return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
return toast.error('File yang diizinkan: .csv, .png, .jpg, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
}}
>
</Dropzone>

4
src/module/task/ui/create_task.tsx
View File

@@ -336,9 +336,9 @@ export default function CreateTask() {
}}
activateOnClick={false}
maxSize={100 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
accept={['image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']}
onReject={(files) => {
return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
return toast.error('File yang diizinkan: .csv, .png, .jpg, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB')
}}
></Dropzone>

4
src/module/user/member/ui/create_member.tsx
View File

@@ -284,9 +284,9 @@ export default function CreateMember() {
}}
activateOnClick={false}
maxSize={10 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic']}
accept={['image/png', 'image/jpeg']}
onReject={(files) => {
return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB')
return toast.error('File yang diizinkan: .png dan .jpg dengan ukuran maksimal 10 MB')
}}
>
</Dropzone>

4
src/module/user/member/ui/edit_member.tsx
View File

@@ -216,9 +216,9 @@ export default function EditMember({ id }: { id: string }) {
}}
activateOnClick={false}
maxSize={10 * 1024 ** 2}
accept={['image/png', 'image/jpeg', 'image/heic']}
accept={['image/png', 'image/jpeg']}
onReject={(files) => {
return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB')
return toast.error('File yang diizinkan: .png dan .jpg dengan ukuran maksimal 10 MB')
}}
>
</Dropzone>

4
src/module/user/profile/ui/edit_profile.tsx
View File

@@ -179,10 +179,10 @@ export default function EditProfile() {
}}
activateOnClick={false}
maxSize={10 * 1024 ** 2}
accept={["image/png", "image/jpeg", "image/heic"]}
accept={["image/png", "image/jpeg"]}
onReject={(files) => {
return toast.error(
"File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB"
"File yang diizinkan: .png dan .jpg dengan ukuran maksimal 10 MB"
);
}}
></Dropzone>