again n again

app/api/auth/login/route.ts

@@ -16,7 +16,7 @@ export async function POST(request: NextRequest) {
       }
 
     // Validate role
-    if (!['ketuajurusan', 'admin'].includes(role)) {
+    if (!['ketuajurusan', 'ketuaprodi', 'pimpinan', 'admin'].includes(role)) {
       return NextResponse.json(
         { message: 'Role tidak valid' },
         { status: 400 }
@@ -25,18 +25,22 @@ export async function POST(request: NextRequest) {
 
     let query = supabase
       .from('user_app')
-      .select('*')
-      .eq('role_user', role);
+      .select('*');
 
     // Add specific field filter based on role
-    if (role === 'ketuajurusan') {
+    if (role === 'pimpinan' || role === 'ketuajurusan' || role === 'ketuaprodi') {
       if (!nip) {
         return NextResponse.json(
-          { message: 'NIP diperlukan untuk Ketua Jurusan' },
+          { message: 'NIP diperlukan untuk Pimpinan' },
           { status: 400 }
         );
       }
-      query = query.eq('nip', nip);
+      // For pimpinan, accept both ketuajurusan and ketuaprodi
+      if (role === 'pimpinan') {
+        query = query.in('role_user', ['ketuajurusan', 'ketuaprodi']).eq('nip', nip);
+      } else {
+        query = query.eq('role_user', role).eq('nip', nip);
+      }
     } else if (role === 'admin') {
       if (!username) {
         return NextResponse.json(
@@ -44,8 +48,8 @@ export async function POST(request: NextRequest) {
           { status: 400 }
         );
       }
-        query = query.eq('username', username);
-      }
+      query = query.eq('role_user', role).eq('username', username);
+    }
 
     const { data: users, error } = await query;
 

app/api/keloladata/data-akun/route.ts

@@ -0,0 +1,328 @@
+import { NextRequest, NextResponse } from 'next/server';
+import supabase from '@/lib/db';
+import bcrypt from 'bcryptjs';
+
+// GET - Ambil semua data user
+export async function GET() {
+  try {
+    const { data, error } = await supabase
+      .from('user_app')
+      .select('id_user, username, nip, role_user, created_at, updated_at')
+      .order('id_user', { ascending: true });
+    
+    if (error) {
+      console.error('Error fetching users:', error);
+      return NextResponse.json(
+        { error: 'Failed to fetch users' },
+        { status: 500 }
+      );
+    }
+    
+    return NextResponse.json(data);
+  } catch (error) {
+    console.error('Error fetching users:', error);
+    return NextResponse.json(
+      { error: 'Failed to fetch users' },
+      { status: 500 }
+    );
+  }
+}
+
+// POST - Buat user baru
+export async function POST(request: NextRequest) {
+  try {
+    const { username, nip, password, role_user } = await request.json();
+    
+    // Validasi input
+    if (!username || username.trim() === '') {
+      return NextResponse.json(
+        { error: 'Username is required' },
+        { status: 400 }
+      );
+    }
+
+    if (!password || password.trim() === '') {
+      return NextResponse.json(
+        { error: 'Password is required' },
+        { status: 400 }
+      );
+    }
+
+    if (!role_user || !['admin', 'ketuajurusan', 'ketuaprodi'].includes(role_user)) {
+      return NextResponse.json(
+        { error: 'Role user must be either admin, ketuajurusan, or ketuaprodi' },
+        { status: 400 }
+      );
+    }
+
+    // Cek apakah username sudah ada
+    const { data: existingUsername, error: existingUsernameError } = await supabase
+      .from('user_app')
+      .select('id_user')
+      .ilike('username', username.trim());
+    
+    if (existingUsernameError) {
+      console.error('Error checking existing username:', existingUsernameError);
+      return NextResponse.json(
+        { error: 'Failed to check existing username' },
+        { status: 500 }
+      );
+    }
+    
+    if (existingUsername && existingUsername.length > 0) {
+      return NextResponse.json(
+        { error: 'Username sudah digunakan' },
+        { status: 409 }
+      );
+    }
+
+    // Cek apakah NIP sudah ada (jika NIP diisi)
+    if (nip && nip.trim() !== '') {
+      const { data: existingNip, error: existingNipError } = await supabase
+        .from('user_app')
+        .select('id_user')
+        .eq('nip', nip.trim());
+      
+      if (existingNipError) {
+        console.error('Error checking existing NIP:', existingNipError);
+        return NextResponse.json(
+          { error: 'Failed to check existing NIP' },
+          { status: 500 }
+        );
+      }
+      
+      if (existingNip && existingNip.length > 0) {
+        return NextResponse.json(
+          { error: 'NIP sudah digunakan' },
+          { status: 409 }
+        );
+      }
+    }
+
+    // Hash password
+    const hashedPassword = await bcrypt.hash(password, 10);
+
+    // Insert user baru
+    const { data, error } = await supabase
+      .from('user_app')
+      .insert([{
+        username: username.trim(),
+        nip: nip && nip.trim() !== '' ? nip.trim() : null,
+        password: hashedPassword,
+        role_user: role_user
+      }])
+      .select('id_user, username, nip, role_user, created_at, updated_at')
+      .single();
+    
+    if (error) {
+      console.error('Error creating user:', error);
+      return NextResponse.json(
+        { error: 'Failed to create user' },
+        { status: 500 }
+      );
+    }
+    
+    return NextResponse.json(data, { status: 201 });
+  } catch (error) {
+    console.error('Error creating user:', error);
+    return NextResponse.json(
+      { error: 'Failed to create user' },
+      { status: 500 }
+    );
+  }
+}
+
+// PUT - Update data user (termasuk reset password)
+export async function PUT(request: NextRequest) {
+  try {
+    const { id_user, username, nip, password, role_user } = await request.json();
+    
+    // Validasi input
+    if (!id_user) {
+      return NextResponse.json(
+        { error: 'ID user is required' },
+        { status: 400 }
+      );
+    }
+
+    if (!username || username.trim() === '') {
+      return NextResponse.json(
+        { error: 'Username is required' },
+        { status: 400 }
+      );
+    }
+
+    if (!role_user || !['admin', 'ketuajurusan', 'ketuaprodi'].includes(role_user)) {
+      return NextResponse.json(
+        { error: 'Role user must be either admin, ketuajurusan, or ketuaprodi' },
+        { status: 400 }
+      );
+    }
+
+    // Check if user exists
+    const { data: existingData, error: existingError } = await supabase
+      .from('user_app')
+      .select('id_user')
+      .eq('id_user', id_user)
+      .single();
+    
+    if (existingError || !existingData) {
+      return NextResponse.json(
+        { error: 'User tidak ditemukan' },
+        { status: 404 }
+      );
+    }
+
+    // Cek apakah username sudah ada untuk user lain
+    const { data: duplicateUsername, error: duplicateUsernameError } = await supabase
+      .from('user_app')
+      .select('id_user')
+      .ilike('username', username.trim())
+      .neq('id_user', id_user);
+    
+    if (duplicateUsernameError) {
+      console.error('Error checking duplicate username:', duplicateUsernameError);
+      return NextResponse.json(
+        { error: 'Failed to check duplicate username' },
+        { status: 500 }
+      );
+    }
+    
+    if (duplicateUsername && duplicateUsername.length > 0) {
+      return NextResponse.json(
+        { error: 'Username sudah digunakan oleh user lain' },
+        { status: 409 }
+      );
+    }
+
+    // Cek apakah NIP sudah ada untuk user lain (jika NIP diisi)
+    if (nip && nip.trim() !== '') {
+      const { data: duplicateNip, error: duplicateNipError } = await supabase
+        .from('user_app')
+        .select('id_user')
+        .eq('nip', nip.trim())
+        .neq('id_user', id_user);
+      
+      if (duplicateNipError) {
+        console.error('Error checking duplicate NIP:', duplicateNipError);
+        return NextResponse.json(
+          { error: 'Failed to check duplicate NIP' },
+          { status: 500 }
+        );
+      }
+      
+      if (duplicateNip && duplicateNip.length > 0) {
+        return NextResponse.json(
+          { error: 'NIP sudah digunakan oleh user lain' },
+          { status: 409 }
+        );
+      }
+    }
+
+    // Siapkan data update
+    const updateData: any = {
+      username: username.trim(),
+      nip: nip && nip.trim() !== '' ? nip.trim() : null,
+      role_user: role_user,
+      updated_at: new Date().toISOString()
+    };
+
+    // Jika password diisi, hash dan update password
+    if (password && password.trim() !== '') {
+      const hashedPassword = await bcrypt.hash(password, 10);
+      updateData.password = hashedPassword;
+    }
+
+    const { data, error } = await supabase
+      .from('user_app')
+      .update(updateData)
+      .eq('id_user', id_user)
+      .select('id_user, username, nip, role_user, created_at, updated_at')
+      .single();
+    
+    if (error) {
+      console.error('Error updating user:', error);
+      return NextResponse.json(
+        { error: 'Failed to update user' },
+        { status: 500 }
+      );
+    }
+    
+    return NextResponse.json(data);
+  } catch (error) {
+    console.error('Error updating user:', error);
+    return NextResponse.json(
+      { error: 'Failed to update user' },
+      { status: 500 }
+    );
+  }
+}
+
+// DELETE - Hapus user
+export async function DELETE(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const id_user = searchParams.get('id_user');
+    
+    if (!id_user) {
+      return NextResponse.json(
+        { error: 'ID user is required' },
+        { status: 400 }
+      );
+    }
+
+    // Check if user exists
+    const { data: existingData, error: existingError } = await supabase
+      .from('user_app')
+      .select('id_user, username')
+      .eq('id_user', id_user)
+      .single();
+    
+    if (existingError || !existingData) {
+      return NextResponse.json(
+        { error: 'User tidak ditemukan' },
+        { status: 404 }
+      );
+    }
+
+    // Prevent deleting admin account (optional safety check)
+    // Uncomment jika ingin mencegah penghapusan admin
+    // const { data: userData } = await supabase
+    //   .from('user_app')
+    //   .select('role_user')
+    //   .eq('id_user', id_user)
+    //   .single();
+    // 
+    // if (userData && userData.role_user === 'admin') {
+    //   return NextResponse.json(
+    //     { error: 'Tidak dapat menghapus akun admin' },
+    //     { status: 403 }
+    //   );
+    // }
+    
+    const { error } = await supabase
+      .from('user_app')
+      .delete()
+      .eq('id_user', id_user);
+    
+    if (error) {
+      console.error('Error deleting user:', error);
+      return NextResponse.json(
+        { error: 'Failed to delete user' },
+        { status: 500 }
+      );
+    }
+    
+    return NextResponse.json(
+      { message: 'User berhasil dihapus' },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error('Error deleting user:', error);
+    return NextResponse.json(
+      { error: 'Failed to delete user' },
+      { status: 500 }
+    );
+  }
+}
+

app/dashboard/page.tsx

@@ -133,15 +133,13 @@ export default function TotalMahasiswaPage() {
     { id: 'expertise', label: 'Kelompok Keahlian' },
     { id: 'dropout', label: 'Terancam Drop Out & Distribusi IPK' },
     { id: 'scholarship', label: 'Beasiswa & Prestasi' },
-    { id: 'demographics', label: 'Asal Kabupaten & Provinsi' },
-    { id: 'bimbingan-dosen', label: 'Bimbingan Dosen' },
-    { id: 'mk-belum-diambil', label: 'Mata Kuliah Belum Diambil' }
+    { id: 'mk-belum-diambil', label: 'Mata Kuliah Belum Diambil & Provinsi Mahasiswa' },
+    { id: 'demographics', label: 'Asal Kabupaten & Bimbingan Dosen' },
   ];
 
   // Navigation menu items for per year data
   const perYearNavItems = [
     { id: 'overview-year', label: 'Jumlah & Status per Angkatan' },
-    
     { id: 'status-year', label: 'Jenis Pendaftaran & Kelompok Keahlian' },
     { id: 'achievement-year', label: 'Beasiswa & Prestasi per Angkatan' },
     { id: 'academic-year', label: 'Distribusi IPK per Angkatan' },
@@ -244,6 +242,7 @@ export default function TotalMahasiswaPage() {
           {/* MK Belum Diambil Section */}
           <div id="mk-belum-diambil" className="grid grid-cols-1 md:grid-cols-2 gap-4 scroll-mt-24">
             <MKBelumDiambilChart selectedYear={selectedYear} />
+            <ProvinsiMahasiswaChart />
           </div>
 
           {/* Demographics Section */}
@@ -252,13 +251,9 @@ export default function TotalMahasiswaPage() {
                   <AsalDaerahChart />
                 </div>
                 <div className="col-span-1">
-                  <ProvinsiMahasiswaChart />
+                  <BimbinganDosenChart />
                 </div>
           </div>
-
-          <div id="bimbingan-dosen" className="grid grid-cols-1 md:grid-cols-2 gap-4 scroll-mt-24">
-            <BimbinganDosenChart />
-          </div>
         </div>
       ) : (
         <div className="space-y-6">

app/keloladata/akun/page.tsx

@@ -0,0 +1,12 @@
+"use client";
+
+import DataTableAkun from "@/components/datatable/kelolaakun/data-table-akun";
+
+export default function KelolaAkunPage() {
+  return (
+    <div className="container mx-auto py-6 px-4 sm:px-6 lg:px-8">
+      <DataTableAkun />
+    </div>
+  );
+}
+

app/page.tsx

@@ -32,7 +32,7 @@ export default function HomePage() {
         const data = await response.json();
         setUser(data.user);
         // Redirect based on user role
-        if (data.user.role_user === 'ketuajurusan') {
+        if (data.user.role_user === 'ketuajurusan' || data.user.role_user === 'ketuaprodi') {
           router.push('/dashboard');
         } else if (data.user.role_user === 'admin') {
           router.push('/keloladata/mahasiswa');
@@ -53,12 +53,22 @@ export default function HomePage() {
     setUser(userData.user);
     setShowLoginDialog(false);
     
-    // Redirect based on user role
+    // Get role label
+    let roleLabel = '';
     if (userData.user.role_user === 'ketuajurusan') {
-      showSuccess("Berhasil!", "Selamat datang, Ketua Jurusan!");
+      roleLabel = 'Ketua Jurusan';
+    } else if (userData.user.role_user === 'ketuaprodi') {
+      roleLabel = 'Ketua Prodi';
+    } else if (userData.user.role_user === 'admin') {
+      roleLabel = 'Admin';
+    }
+    
+    showSuccess("Berhasil!", `Selamat datang, ${roleLabel}`);
+    
+    // Redirect based on user role
+    if (userData.user.role_user === 'ketuajurusan' || userData.user.role_user === 'ketuaprodi') {
       router.push('/dashboard');
     } else if (userData.user.role_user === 'admin') {
-      showSuccess("Berhasil!", "Selamat datang, Admin!");
       router.push('/keloladata/mahasiswa');
     }
   };
@@ -133,7 +143,7 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
         body: JSON.stringify({
           nip: ketuaForm.nip,
           password: ketuaForm.password,
-          role: "ketuajurusan",
+          role: "pimpinan", // Will accept both ketuajurusan and ketuaprodi
         }),
       });
 
@@ -210,7 +220,7 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
                 : "text-slate-300 hover:text-white hover:bg-slate-600/50"
             }`}
           >
-            Ketua Jurusan
+            Pimpinan
           </button>
           <button
             onClick={() => setActiveTab("admin")}
@@ -224,7 +234,7 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
           </button>
         </div>
 
-        {/* Ketua Jurusan form */}
+        {/* Pimpinan form (Ketua Jurusan / Ketua Prodi) */}
         {activeTab === "ketua" && (
           <form onSubmit={handleKetuaLogin} className="space-y-4">
             <div className="space-y-1">
@@ -266,7 +276,7 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
                   Loading...
                 </div>
               ) : (
-                "Login sebagai Ketua Jurusan"
+                "Login sebagai Pimpinan"
               )}
             </button>
           </form>