From 6941b8bb8d28e889a2c88b491d869b14bc8abe08 Mon Sep 17 00:00:00 2001 From: Randa Firman Putra Date: Sun, 29 Jun 2025 10:30:14 +0700 Subject: [PATCH] Change Directory For Charts --- app/dashboard/mahasiswa/beasiswa/page.tsx | 16 +- app/dashboard/mahasiswa/berprestasi/page.tsx | 16 +- .../mahasiswa/lulustepatwaktu/page.tsx | 12 +- app/dashboard/mahasiswa/status/page.tsx | 12 +- app/dashboard/mahasiswa/total/page.tsx | 16 +- app/dashboard/page.tsx | 10 +- app/page.tsx | 438 +++++++++--------- .../{ => charts}/AsalDaerahBeasiswaChart.tsx | 0 components/{ => charts}/AsalDaerahChart.tsx | 0 .../{ => charts}/AsalDaerahLulusChart.tsx | 0 .../AsalDaerahPerAngkatanChart.tsx | 0 .../{ => charts}/AsalDaerahPrestasiChart.tsx | 0 .../{ => charts}/AsalDaerahStatusChart.tsx | 0 components/{ => charts}/IPKBeasiswaChart.tsx | 0 components/{ => charts}/IPKChart.tsx | 0 .../{ => charts}/IPKJenisKelaminChart.tsx | 0 .../{ => charts}/IPKLulusTepatChart.tsx | 0 components/{ => charts}/IPKPrestasiChart.tsx | 0 components/{ => charts}/IpkStatusChart.tsx | 0 .../JenisPendaftaranBeasiswaChart.tsx | 0 .../JenisPendaftaranBeasiswaPieChart.tsx | 0 .../{ => charts}/JenisPendaftaranChart.tsx | 0 .../JenisPendaftaranLulusChart.tsx | 0 .../JenisPendaftaranLulusPieChart.tsx | 0 .../JenisPendaftaranPerAngkatanChart.tsx | 0 .../JenisPendaftaranPrestasiChart.tsx | 0 .../JenisPendaftaranPrestasiPieChart.tsx | 0 .../JenisPendaftaranStatusChart.tsx | 0 .../JenisPendaftaranStatusPieChart.tsx | 0 .../{ => charts}/LulusTepatWaktuChart.tsx | 0 .../{ => charts}/LulusTepatWaktuPieChart.tsx | 0 components/{ => charts}/NamaBeasiswaChart.tsx | 0 .../{ => charts}/NamaBeasiswaPieChart.tsx | 0 .../{ => charts}/StatistikMahasiswaChart.tsx | 0 .../StatistikPerAngkatanChart.tsx | 0 .../{ => charts}/StatusMahasiswaChart.tsx | 0 .../StatusMahasiswaFilterChart.tsx | 0 .../StatusMahasiswaFilterPieChart.tsx | 0 .../{ => charts}/TingkatPrestasiChart.tsx | 0 .../{ => charts}/TingkatPrestasiPieChart.tsx | 0 .../{ => charts}/TotalBeasiswaChart.tsx | 0 .../{ => charts}/TotalBeasiswaPieChart.tsx | 0 .../{ => charts}/TotalPrestasiChart.tsx | 0 .../{ => charts}/TotalPrestasiPieChart.tsx | 0 components/ui/dialog.tsx | 13 +- 45 files changed, 276 insertions(+), 257 deletions(-) rename components/{ => charts}/AsalDaerahBeasiswaChart.tsx (100%) rename components/{ => charts}/AsalDaerahChart.tsx (100%) rename components/{ => charts}/AsalDaerahLulusChart.tsx (100%) rename components/{ => charts}/AsalDaerahPerAngkatanChart.tsx (100%) rename components/{ => charts}/AsalDaerahPrestasiChart.tsx (100%) rename components/{ => charts}/AsalDaerahStatusChart.tsx (100%) rename components/{ => charts}/IPKBeasiswaChart.tsx (100%) rename components/{ => charts}/IPKChart.tsx (100%) rename components/{ => charts}/IPKJenisKelaminChart.tsx (100%) rename components/{ => charts}/IPKLulusTepatChart.tsx (100%) rename components/{ => charts}/IPKPrestasiChart.tsx (100%) rename components/{ => charts}/IpkStatusChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranBeasiswaChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranBeasiswaPieChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranLulusChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranLulusPieChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranPerAngkatanChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranPrestasiChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranPrestasiPieChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranStatusChart.tsx (100%) rename components/{ => charts}/JenisPendaftaranStatusPieChart.tsx (100%) rename components/{ => charts}/LulusTepatWaktuChart.tsx (100%) rename components/{ => charts}/LulusTepatWaktuPieChart.tsx (100%) rename components/{ => charts}/NamaBeasiswaChart.tsx (100%) rename components/{ => charts}/NamaBeasiswaPieChart.tsx (100%) rename components/{ => charts}/StatistikMahasiswaChart.tsx (100%) rename components/{ => charts}/StatistikPerAngkatanChart.tsx (100%) rename components/{ => charts}/StatusMahasiswaChart.tsx (100%) rename components/{ => charts}/StatusMahasiswaFilterChart.tsx (100%) rename components/{ => charts}/StatusMahasiswaFilterPieChart.tsx (100%) rename components/{ => charts}/TingkatPrestasiChart.tsx (100%) rename components/{ => charts}/TingkatPrestasiPieChart.tsx (100%) rename components/{ => charts}/TotalBeasiswaChart.tsx (100%) rename components/{ => charts}/TotalBeasiswaPieChart.tsx (100%) rename components/{ => charts}/TotalPrestasiChart.tsx (100%) rename components/{ => charts}/TotalPrestasiPieChart.tsx (100%) diff --git a/app/dashboard/mahasiswa/beasiswa/page.tsx b/app/dashboard/mahasiswa/beasiswa/page.tsx index 37e85be..7f24132 100644 --- a/app/dashboard/mahasiswa/beasiswa/page.tsx +++ b/app/dashboard/mahasiswa/beasiswa/page.tsx @@ -3,14 +3,14 @@ import { useState } from "react"; import FilterTahunAngkatan from "@/components/FilterTahunAngkatan"; import FilterJenisBeasiswa from "@/components/FilterJenisBeasiswa"; -import TotalBeasiswaChart from "@/components/TotalBeasiswaChart"; -import TotalBeasiswaPieChart from "@/components/TotalBeasiswaPieChart"; -import NamaBeasiswaChart from "@/components/NamaBeasiswaChart"; -import NamaBeasiswaPieChart from "@/components/NamaBeasiswaPieChart"; -import JenisPendaftaranBeasiswaChart from "@/components/JenisPendaftaranBeasiswaChart"; -import JenisPendaftaranBeasiswaPieChart from "@/components/JenisPendaftaranBeasiswaPieChart"; -import AsalDaerahBeasiswaChart from "@/components/AsalDaerahBeasiswaChart"; -import IPKBeasiswaChart from "@/components/IPKBeasiswaChart"; +import TotalBeasiswaChart from "@/components/charts/TotalBeasiswaChart"; +import TotalBeasiswaPieChart from "@/components/charts/TotalBeasiswaPieChart"; +import NamaBeasiswaChart from "@/components/charts/NamaBeasiswaChart"; +import NamaBeasiswaPieChart from "@/components/charts/NamaBeasiswaPieChart"; +import JenisPendaftaranBeasiswaChart from "@/components/charts/JenisPendaftaranBeasiswaChart"; +import JenisPendaftaranBeasiswaPieChart from "@/components/charts/JenisPendaftaranBeasiswaPieChart"; +import AsalDaerahBeasiswaChart from "@/components/charts/AsalDaerahBeasiswaChart"; +import IPKBeasiswaChart from "@/components/charts/IPKBeasiswaChart"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; export default function BeasiswaMahasiswaPage() { diff --git a/app/dashboard/mahasiswa/berprestasi/page.tsx b/app/dashboard/mahasiswa/berprestasi/page.tsx index 8707374..4601074 100644 --- a/app/dashboard/mahasiswa/berprestasi/page.tsx +++ b/app/dashboard/mahasiswa/berprestasi/page.tsx @@ -4,14 +4,14 @@ import { useState } from "react"; import FilterTahunAngkatan from "@/components/FilterTahunAngkatan"; import FilterJenisPrestasi from "@/components/FilterJenisPrestasi"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; -import TotalPrestasiChart from "@/components/TotalPrestasiChart"; -import TotalPrestasiPieChart from "@/components/TotalPrestasiPieChart"; -import TingkatPrestasiChart from "@/components/TingkatPrestasiChart"; -import TingkatPrestasiPieChart from "@/components/TingkatPrestasiPieChart"; -import JenisPendaftaranPrestasiChart from "@/components/JenisPendaftaranPrestasiChart"; -import JenisPendaftaranPrestasiPieChart from "@/components/JenisPendaftaranPrestasiPieChart"; -import AsalDaerahPrestasiChart from "@/components/AsalDaerahPrestasiChart"; -import IPKPrestasiChart from "@/components/IPKPrestasiChart"; +import TotalPrestasiChart from "@/components/charts/TotalPrestasiChart"; +import TotalPrestasiPieChart from "@/components/charts/TotalPrestasiPieChart"; +import TingkatPrestasiChart from "@/components/charts/TingkatPrestasiChart"; +import TingkatPrestasiPieChart from "@/components/charts/TingkatPrestasiPieChart"; +import JenisPendaftaranPrestasiChart from "@/components/charts/JenisPendaftaranPrestasiChart"; +import JenisPendaftaranPrestasiPieChart from "@/components/charts/JenisPendaftaranPrestasiPieChart"; +import AsalDaerahPrestasiChart from "@/components/charts/AsalDaerahPrestasiChart"; +import IPKPrestasiChart from "@/components/charts/IPKPrestasiChart"; export default function BerprestasiMahasiswaPage() { const [selectedYear, setSelectedYear] = useState("all"); diff --git a/app/dashboard/mahasiswa/lulustepatwaktu/page.tsx b/app/dashboard/mahasiswa/lulustepatwaktu/page.tsx index 0735a93..543ad20 100644 --- a/app/dashboard/mahasiswa/lulustepatwaktu/page.tsx +++ b/app/dashboard/mahasiswa/lulustepatwaktu/page.tsx @@ -3,12 +3,12 @@ import { useState } from "react"; import FilterTahunAngkatan from "@/components/FilterTahunAngkatan"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; -import LulusTepatWaktuChart from "@/components/LulusTepatWaktuChart"; -import LulusTepatWaktuPieChart from "@/components/LulusTepatWaktuPieChart"; -import JenisPendaftaranLulusChart from "@/components/JenisPendaftaranLulusChart"; -import JenisPendaftaranLulusPieChart from "@/components/JenisPendaftaranLulusPieChart"; -import AsalDaerahLulusChart from "@/components/AsalDaerahLulusChart"; -import IPKLulusTepatChart from "@/components/IPKLulusTepatChart"; +import LulusTepatWaktuChart from "@/components/charts/LulusTepatWaktuChart"; +import LulusTepatWaktuPieChart from "@/components/charts/LulusTepatWaktuPieChart"; +import JenisPendaftaranLulusChart from "@/components/charts/JenisPendaftaranLulusChart"; +import JenisPendaftaranLulusPieChart from "@/components/charts/JenisPendaftaranLulusPieChart"; +import AsalDaerahLulusChart from "@/components/charts/AsalDaerahLulusChart"; +import IPKLulusTepatChart from "@/components/charts/IPKLulusTepatChart"; export default function LulusTepatWaktuPage() { const [selectedYear, setSelectedYear] = useState("all"); diff --git a/app/dashboard/mahasiswa/status/page.tsx b/app/dashboard/mahasiswa/status/page.tsx index b3f9ccb..8b1054c 100644 --- a/app/dashboard/mahasiswa/status/page.tsx +++ b/app/dashboard/mahasiswa/status/page.tsx @@ -3,12 +3,12 @@ import { useState } from "react"; import FilterTahunAngkatan from "@/components/FilterTahunAngkatan"; import FilterStatusKuliah from "@/components/FilterStatusKuliah"; -import StatusMahasiswaFilterChart from "@/components/StatusMahasiswaFilterChart"; -import StatusMahasiswaFilterPieChart from "@/components/StatusMahasiswaFilterPieChart"; -import JenisPendaftaranStatusChart from "@/components/JenisPendaftaranStatusChart"; -import JenisPendaftaranStatusPieChart from "@/components/JenisPendaftaranStatusPieChart"; -import AsalDaerahStatusChart from '@/components/AsalDaerahStatusChart'; -import IpkStatusChart from '@/components/IpkStatusChart'; +import StatusMahasiswaFilterChart from "@/components/charts/StatusMahasiswaFilterChart"; +import StatusMahasiswaFilterPieChart from "@/components/charts/StatusMahasiswaFilterPieChart"; +import JenisPendaftaranStatusChart from "@/components/charts/JenisPendaftaranStatusChart"; +import JenisPendaftaranStatusPieChart from "@/components/charts/JenisPendaftaranStatusPieChart"; +import AsalDaerahStatusChart from '@/components/charts/AsalDaerahStatusChart'; +import IpkStatusChart from '@/components/charts/IpkStatusChart'; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; export default function StatusMahasiswaPage() { diff --git a/app/dashboard/mahasiswa/total/page.tsx b/app/dashboard/mahasiswa/total/page.tsx index d64745d..cc83ac9 100644 --- a/app/dashboard/mahasiswa/total/page.tsx +++ b/app/dashboard/mahasiswa/total/page.tsx @@ -1,15 +1,15 @@ 'use client'; import { useState } from "react"; -import StatistikMahasiswaChart from "@/components/StatistikMahasiswaChart"; -import StatistikPerAngkatanChart from "@/components/StatistikPerAngkatanChart"; -import JenisPendaftaranChart from "@/components/JenisPendaftaranChart"; -import AsalDaerahChart from "@/components/AsalDaerahChart"; -import IPKChart from "@/components/IPKChart"; +import StatistikMahasiswaChart from "@/components/charts/StatistikMahasiswaChart"; +import StatistikPerAngkatanChart from "@/components/charts/StatistikPerAngkatanChart"; +import JenisPendaftaranChart from "@/components/charts/JenisPendaftaranChart"; +import AsalDaerahChart from "@/components/charts/AsalDaerahChart"; +import IPKChart from "@/components/charts/IPKChart"; import FilterTahunAngkatan from "@/components/FilterTahunAngkatan"; -import JenisPendaftaranPerAngkatanChart from "@/components/JenisPendaftaranPerAngkatanChart"; -import AsalDaerahPerAngkatanChart from "@/components/AsalDaerahPerAngkatanChart"; -import IPKJenisKelaminChart from "@/components/IPKJenisKelaminChart"; +import JenisPendaftaranPerAngkatanChart from "@/components/charts/JenisPendaftaranPerAngkatanChart"; +import AsalDaerahPerAngkatanChart from "@/components/charts/AsalDaerahPerAngkatanChart"; +import IPKJenisKelaminChart from "@/components/charts/IPKJenisKelaminChart"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; export default function TotalMahasiswaPage() { diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index e7e6b4d..3c95c5b 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -4,11 +4,11 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Users, GraduationCap, Trophy, BookOpen } from "lucide-react"; import { useEffect, useState } from "react"; import { useTheme } from "next-themes"; -import StatusMahasiswaChart from "@/components/StatusMahasiswaChart"; -import StatistikMahasiswaChart from "@/components/StatistikMahasiswaChart"; -import JenisPendaftaranChart from "@/components/JenisPendaftaranChart"; -import AsalDaerahChart from "@/components/AsalDaerahChart"; -import IPKChart from '@/components/IPKChart'; +import StatusMahasiswaChart from "@/components/charts/StatusMahasiswaChart"; +import StatistikMahasiswaChart from "@/components/charts/StatistikMahasiswaChart"; +import JenisPendaftaranChart from "@/components/charts/JenisPendaftaranChart"; +import AsalDaerahChart from "@/components/charts/AsalDaerahChart"; +import IPKChart from '@/components/charts/IPKChart'; interface MahasiswaTotal { total_mahasiswa: number; diff --git a/app/page.tsx b/app/page.tsx index c0a022e..80f9930 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,22 +1,22 @@ 'use client'; -import { useState } from 'react'; +import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { Alert, AlertDescription } from "@/components/ui/alert"; -import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"; -import { Loader2, Eye, EyeOff, LogIn, UserPlus } from "lucide-react"; +import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog"; +import { Loader2, Eye, EyeOff } from "lucide-react"; import { ThemeProvider } from '@/components/theme-provider'; import { Toaster } from '@/components/ui/toaster'; export default function LandingPage() { const router = useRouter(); - const [isLoginOpen, setIsLoginOpen] = useState(false); + const [isLoginOpen, setIsLoginOpen] = useState(true); const [isRegisterOpen, setIsRegisterOpen] = useState(false); - const [activeTab, setActiveTab] = useState('admin'); + const [activeTab, setActiveTab] = useState('dosen'); const [loading, setLoading] = useState(false); const [showPassword, setShowPassword] = useState(false); const [error, setError] = useState(''); @@ -146,6 +146,16 @@ export default function LandingPage() { } }; + const openRegister = () => { + setIsLoginOpen(false); + setIsRegisterOpen(true); + }; + + const openLogin = () => { + setIsRegisterOpen(false); + setIsLoginOpen(true); + }; + return (
-
-
-

- Portal Data Informatika -

-

- Visualisasi Data Akademik Mahasiswa Jurusan Informatika -

-
- - - - - - - Login Portal Data Informatika - - Silakan login sesuai dengan role Anda - - - - - Admin - Dosen - - - -
-
- - setAdminForm({ ...adminForm, username: e.target.value })} - required - /> -
-
- -
- setAdminForm({ ...adminForm, password: e.target.value })} - required - /> - -
-
- -
- - - -
-
- - setDosenForm({ ...dosenForm, nip: e.target.value })} - required - /> -
-
- -
- setDosenForm({ ...dosenForm, password: e.target.value })} - required - /> - -
-
- -
- - - - {error && ( - - - {error} - - - )} - - - - - - - - - - Registrasi Dosen - - Daftar akun baru untuk dosen Portal Data Informatika - - -
-
- + {/* Login Dialog */} + {}}> + + + Login Portal Data Informatika + + Silakan login sesuai dengan role Anda + + + + + Dosen + Admin + + + + +
+ + setDosenForm({ ...dosenForm, nip: e.target.value })} + required + /> +
+
+ +
setRegisterForm({ ...registerForm, nip: e.target.value })} + id="dosen-password" + type={showPassword ? "text" : "password"} + placeholder="Masukkan password" + value={dosenForm.password} + onChange={(e) => setDosenForm({ ...dosenForm, password: e.target.value })} required /> +
-
- -
- setRegisterForm({ ...registerForm, password: e.target.value })} - required - /> - -
-
-
- +
+ + + +
+

+ Belum punya akun?{' '} +

+ +
+ + + +
+
+ + setAdminForm({ ...adminForm, username: e.target.value })} + required + /> +
+
+ +
setRegisterForm({ ...registerForm, confirmPassword: e.target.value })} + id="admin-password" + type={showPassword ? "text" : "password"} + placeholder="Masukkan password" + value={adminForm.password} + onChange={(e) => setAdminForm({ ...adminForm, password: e.target.value })} required /> -
- - - - {error && ( - - - {error} - - - )} - -
-
-
-
+ +
+
+ + + + + + {error && ( + + + {error} + + + )} + + + + {/* Register Dialog */} + {}}> + + + Registrasi Dosen + + Daftar akun baru untuk dosen Portal Data Informatika + + +
+
+ + setRegisterForm({ ...registerForm, nip: e.target.value })} + required + /> +
+
+ +
+ setRegisterForm({ ...registerForm, password: e.target.value })} + required + /> +
+
+
+ + setRegisterForm({ ...registerForm, confirmPassword: e.target.value })} + required + /> +
+ +
+ +
+

+ Sudah punya akun?{' '} +

+ +
+ + {error && ( + + + {error} + + + )} + + + ); diff --git a/components/AsalDaerahBeasiswaChart.tsx b/components/charts/AsalDaerahBeasiswaChart.tsx similarity index 100% rename from components/AsalDaerahBeasiswaChart.tsx rename to components/charts/AsalDaerahBeasiswaChart.tsx diff --git a/components/AsalDaerahChart.tsx b/components/charts/AsalDaerahChart.tsx similarity index 100% rename from components/AsalDaerahChart.tsx rename to components/charts/AsalDaerahChart.tsx diff --git a/components/AsalDaerahLulusChart.tsx b/components/charts/AsalDaerahLulusChart.tsx similarity index 100% rename from components/AsalDaerahLulusChart.tsx rename to components/charts/AsalDaerahLulusChart.tsx diff --git a/components/AsalDaerahPerAngkatanChart.tsx b/components/charts/AsalDaerahPerAngkatanChart.tsx similarity index 100% rename from components/AsalDaerahPerAngkatanChart.tsx rename to components/charts/AsalDaerahPerAngkatanChart.tsx diff --git a/components/AsalDaerahPrestasiChart.tsx b/components/charts/AsalDaerahPrestasiChart.tsx similarity index 100% rename from components/AsalDaerahPrestasiChart.tsx rename to components/charts/AsalDaerahPrestasiChart.tsx diff --git a/components/AsalDaerahStatusChart.tsx b/components/charts/AsalDaerahStatusChart.tsx similarity index 100% rename from components/AsalDaerahStatusChart.tsx rename to components/charts/AsalDaerahStatusChart.tsx diff --git a/components/IPKBeasiswaChart.tsx b/components/charts/IPKBeasiswaChart.tsx similarity index 100% rename from components/IPKBeasiswaChart.tsx rename to components/charts/IPKBeasiswaChart.tsx diff --git a/components/IPKChart.tsx b/components/charts/IPKChart.tsx similarity index 100% rename from components/IPKChart.tsx rename to components/charts/IPKChart.tsx diff --git a/components/IPKJenisKelaminChart.tsx b/components/charts/IPKJenisKelaminChart.tsx similarity index 100% rename from components/IPKJenisKelaminChart.tsx rename to components/charts/IPKJenisKelaminChart.tsx diff --git a/components/IPKLulusTepatChart.tsx b/components/charts/IPKLulusTepatChart.tsx similarity index 100% rename from components/IPKLulusTepatChart.tsx rename to components/charts/IPKLulusTepatChart.tsx diff --git a/components/IPKPrestasiChart.tsx b/components/charts/IPKPrestasiChart.tsx similarity index 100% rename from components/IPKPrestasiChart.tsx rename to components/charts/IPKPrestasiChart.tsx diff --git a/components/IpkStatusChart.tsx b/components/charts/IpkStatusChart.tsx similarity index 100% rename from components/IpkStatusChart.tsx rename to components/charts/IpkStatusChart.tsx diff --git a/components/JenisPendaftaranBeasiswaChart.tsx b/components/charts/JenisPendaftaranBeasiswaChart.tsx similarity index 100% rename from components/JenisPendaftaranBeasiswaChart.tsx rename to components/charts/JenisPendaftaranBeasiswaChart.tsx diff --git a/components/JenisPendaftaranBeasiswaPieChart.tsx b/components/charts/JenisPendaftaranBeasiswaPieChart.tsx similarity index 100% rename from components/JenisPendaftaranBeasiswaPieChart.tsx rename to components/charts/JenisPendaftaranBeasiswaPieChart.tsx diff --git a/components/JenisPendaftaranChart.tsx b/components/charts/JenisPendaftaranChart.tsx similarity index 100% rename from components/JenisPendaftaranChart.tsx rename to components/charts/JenisPendaftaranChart.tsx diff --git a/components/JenisPendaftaranLulusChart.tsx b/components/charts/JenisPendaftaranLulusChart.tsx similarity index 100% rename from components/JenisPendaftaranLulusChart.tsx rename to components/charts/JenisPendaftaranLulusChart.tsx diff --git a/components/JenisPendaftaranLulusPieChart.tsx b/components/charts/JenisPendaftaranLulusPieChart.tsx similarity index 100% rename from components/JenisPendaftaranLulusPieChart.tsx rename to components/charts/JenisPendaftaranLulusPieChart.tsx diff --git a/components/JenisPendaftaranPerAngkatanChart.tsx b/components/charts/JenisPendaftaranPerAngkatanChart.tsx similarity index 100% rename from components/JenisPendaftaranPerAngkatanChart.tsx rename to components/charts/JenisPendaftaranPerAngkatanChart.tsx diff --git a/components/JenisPendaftaranPrestasiChart.tsx b/components/charts/JenisPendaftaranPrestasiChart.tsx similarity index 100% rename from components/JenisPendaftaranPrestasiChart.tsx rename to components/charts/JenisPendaftaranPrestasiChart.tsx diff --git a/components/JenisPendaftaranPrestasiPieChart.tsx b/components/charts/JenisPendaftaranPrestasiPieChart.tsx similarity index 100% rename from components/JenisPendaftaranPrestasiPieChart.tsx rename to components/charts/JenisPendaftaranPrestasiPieChart.tsx diff --git a/components/JenisPendaftaranStatusChart.tsx b/components/charts/JenisPendaftaranStatusChart.tsx similarity index 100% rename from components/JenisPendaftaranStatusChart.tsx rename to components/charts/JenisPendaftaranStatusChart.tsx diff --git a/components/JenisPendaftaranStatusPieChart.tsx b/components/charts/JenisPendaftaranStatusPieChart.tsx similarity index 100% rename from components/JenisPendaftaranStatusPieChart.tsx rename to components/charts/JenisPendaftaranStatusPieChart.tsx diff --git a/components/LulusTepatWaktuChart.tsx b/components/charts/LulusTepatWaktuChart.tsx similarity index 100% rename from components/LulusTepatWaktuChart.tsx rename to components/charts/LulusTepatWaktuChart.tsx diff --git a/components/LulusTepatWaktuPieChart.tsx b/components/charts/LulusTepatWaktuPieChart.tsx similarity index 100% rename from components/LulusTepatWaktuPieChart.tsx rename to components/charts/LulusTepatWaktuPieChart.tsx diff --git a/components/NamaBeasiswaChart.tsx b/components/charts/NamaBeasiswaChart.tsx similarity index 100% rename from components/NamaBeasiswaChart.tsx rename to components/charts/NamaBeasiswaChart.tsx diff --git a/components/NamaBeasiswaPieChart.tsx b/components/charts/NamaBeasiswaPieChart.tsx similarity index 100% rename from components/NamaBeasiswaPieChart.tsx rename to components/charts/NamaBeasiswaPieChart.tsx diff --git a/components/StatistikMahasiswaChart.tsx b/components/charts/StatistikMahasiswaChart.tsx similarity index 100% rename from components/StatistikMahasiswaChart.tsx rename to components/charts/StatistikMahasiswaChart.tsx diff --git a/components/StatistikPerAngkatanChart.tsx b/components/charts/StatistikPerAngkatanChart.tsx similarity index 100% rename from components/StatistikPerAngkatanChart.tsx rename to components/charts/StatistikPerAngkatanChart.tsx diff --git a/components/StatusMahasiswaChart.tsx b/components/charts/StatusMahasiswaChart.tsx similarity index 100% rename from components/StatusMahasiswaChart.tsx rename to components/charts/StatusMahasiswaChart.tsx diff --git a/components/StatusMahasiswaFilterChart.tsx b/components/charts/StatusMahasiswaFilterChart.tsx similarity index 100% rename from components/StatusMahasiswaFilterChart.tsx rename to components/charts/StatusMahasiswaFilterChart.tsx diff --git a/components/StatusMahasiswaFilterPieChart.tsx b/components/charts/StatusMahasiswaFilterPieChart.tsx similarity index 100% rename from components/StatusMahasiswaFilterPieChart.tsx rename to components/charts/StatusMahasiswaFilterPieChart.tsx diff --git a/components/TingkatPrestasiChart.tsx b/components/charts/TingkatPrestasiChart.tsx similarity index 100% rename from components/TingkatPrestasiChart.tsx rename to components/charts/TingkatPrestasiChart.tsx diff --git a/components/TingkatPrestasiPieChart.tsx b/components/charts/TingkatPrestasiPieChart.tsx similarity index 100% rename from components/TingkatPrestasiPieChart.tsx rename to components/charts/TingkatPrestasiPieChart.tsx diff --git a/components/TotalBeasiswaChart.tsx b/components/charts/TotalBeasiswaChart.tsx similarity index 100% rename from components/TotalBeasiswaChart.tsx rename to components/charts/TotalBeasiswaChart.tsx diff --git a/components/TotalBeasiswaPieChart.tsx b/components/charts/TotalBeasiswaPieChart.tsx similarity index 100% rename from components/TotalBeasiswaPieChart.tsx rename to components/charts/TotalBeasiswaPieChart.tsx diff --git a/components/TotalPrestasiChart.tsx b/components/charts/TotalPrestasiChart.tsx similarity index 100% rename from components/TotalPrestasiChart.tsx rename to components/charts/TotalPrestasiChart.tsx diff --git a/components/TotalPrestasiPieChart.tsx b/components/charts/TotalPrestasiPieChart.tsx similarity index 100% rename from components/TotalPrestasiPieChart.tsx rename to components/charts/TotalPrestasiPieChart.tsx diff --git a/components/ui/dialog.tsx b/components/ui/dialog.tsx index 7d7a9d3..eadeeab 100644 --- a/components/ui/dialog.tsx +++ b/components/ui/dialog.tsx @@ -49,8 +49,9 @@ function DialogOverlay({ function DialogContent({ className, children, + hideClose = false, ...props -}: React.ComponentProps) { +}: React.ComponentProps & { hideClose?: boolean }) { return ( @@ -63,10 +64,12 @@ function DialogContent({ {...props} > {children} - - - Close - + {!hideClose && ( + + + Close + + )} )