intial commit

ayo coba
ayo commit lagi
2026-03-05 01:16:55 +07:00 · 2026-02-28 00:53:22 +07:00 · 2026-02-22 00:21:37 +07:00 · 2026-02-04 02:09:05 +07:00 · 2025-12-17 19:48:45 +07:00 · 2025-12-14 20:25:04 +07:00
19 changed files with 470 additions and 164 deletions
--- a/app/api/auth/login/route.ts
+++ b/app/api/auth/login/route.ts
@@ -88,7 +88,7 @@ export async function POST(request: NextRequest) {
    // Set secure session cookie
    response.cookies.set('user_session', JSON.stringify(userWithoutPassword), {
      httpOnly: true,
-      secure: process.env.NODE_ENV === 'production',
+      secure: false, // Set to false to allow HTTP (for Coolify deployment)
      sameSite: 'lax',
      maxAge: 24 * 60 * 60, // 24 hours
      path: '/',
--- a/app/api/auth/logout/route.ts
+++ b/app/api/auth/logout/route.ts
@@ -7,12 +7,12 @@ export async function POST() {

  // Clear the session cookie
  response.cookies.set('user_session', '', {
-      httpOnly: true,
-      secure: process.env.NODE_ENV === 'production',
+    httpOnly: true,
+    secure: false, // Set to false to allow HTTP (for Coolify deployment)
    sameSite: 'lax',
    maxAge: 0, // Expire immediately
    path: '/',
-    });
+  });

    return response;
 }
--- a/app/api/keloladata/data-nilai-mahasiswa/route.ts
+++ b/app/api/keloladata/data-nilai-mahasiswa/route.ts
@@ -78,11 +78,6 @@ export async function GET(request: NextRequest) {
          mata_kuliah!inner(kode_mk, nama_mk)
        `);

-      // Add search condition if provided
-      if (search) {
-        query = query.or(`mahasiswa.nim.ilike.%${search}%,mahasiswa.nama.ilike.%${search}%,mata_kuliah.kode_mk.ilike.%${search}%,mata_kuliah.nama_mk.ilike.%${search}%`);
-      }
-
      // Add semester filter if provided
      if (semester && semester !== 'all') {
        query = query.eq('semester', parseInt(semester));
@@ -94,7 +89,7 @@ export async function GET(request: NextRequest) {
      }

      // Add order by
-      query = query.order('semester', { ascending: true }).order('mahasiswa(nim)', { ascending: true });
+      query = query.order('semester', { ascending: true });

      const { data, error } = await query;

@@ -104,7 +99,7 @@ export async function GET(request: NextRequest) {
      }

      // Transformasi data untuk meratakan field yang di-join
-      const transformedData = data.map((item: any) => ({
+      let transformedData = data.map((item: any) => ({
        ...item,
        nim: item.mahasiswa?.nim || '',
        nama: item.mahasiswa?.nama || '',
@@ -115,6 +110,27 @@ export async function GET(request: NextRequest) {
        return rest;
      });

+      // Client-side search filtering (untuk joined tables)
+      if (search) {
+        const searchLower = search.toLowerCase();
+        transformedData = transformedData.filter((item: any) => {
+          return (
+            item.nim?.toLowerCase().includes(searchLower) ||
+            item.nama?.toLowerCase().includes(searchLower) ||
+            item.kode_mk?.toLowerCase().includes(searchLower) ||
+            item.nama_mk?.toLowerCase().includes(searchLower)
+          );
+        });
+      }
+
+      // Sort by nim after filtering
+      transformedData.sort((a: any, b: any) => {
+        if (a.semester !== b.semester) {
+          return a.semester - b.semester;
+        }
+        return a.nim.localeCompare(b.nim);
+      });
+
      return NextResponse.json(transformedData);
    }
  } catch (error) {
@@ -230,7 +246,7 @@ export async function POST(request: NextRequest) {
    }

    return NextResponse.json(
-      { 
+      {
        message: 'Nilai mahasiswa berhasil ditambahkan',
        id: data.id_nilai,
        mahasiswa: mahasiswa.nama,
--- a/app/api/keloladata/data-nilai-mahasiswa/upload/route.ts
+++ b/app/api/keloladata/data-nilai-mahasiswa/upload/route.ts
@@ -54,7 +54,7 @@ export async function POST(request: NextRequest) {
      // Handle CSV file
      const text = new TextDecoder().decode(buffer);
      const lines = text.split('\n').filter(line => line.trim());
-      
+
      if (lines.length < 2) {
        return NextResponse.json(
          { message: 'File must contain at least header and one data row' },
@@ -63,7 +63,7 @@ export async function POST(request: NextRequest) {
      }

      const headers = lines[0].split(',').map(h => h.trim().replace(/"/g, ''));
-      
+
      for (let i = 1; i < lines.length; i++) {
        const values = lines[i].split(',').map(v => v.trim().replace(/"/g, ''));
        const row: any = {};
@@ -111,33 +111,33 @@ export async function POST(request: NextRequest) {
    // Further normalize data with column mappings
    const finalData = normalizedData.map(row => {
      const finalRow: any = {};
-      
+
      Object.keys(columnMappings).forEach(standardKey => {
        const variations = columnMappings[standardKey as keyof typeof columnMappings];
        let value = null;
-        
+
        // Try to find the value using different variations
        for (const variation of variations) {
          const normalizedVariation = variation.toLowerCase()
            .replace(/\s+/g, '_')
            .replace(/[^a-z0-9_]/g, '');
-          
+
          if (row[normalizedVariation] !== undefined && row[normalizedVariation] !== null && row[normalizedVariation] !== '') {
            value = row[normalizedVariation];
            break;
          }
        }
-        
+
        finalRow[standardKey] = value;
      });
-      
+
      return finalRow;
    });

    // Validate required columns
    const requiredColumns = ['nim', 'kode_mk', 'semester', 'nilai_huruf', 'nilai_angka'];
    const firstRow = finalData[0];
-    const missingColumns = requiredColumns.filter(col => 
+    const missingColumns = requiredColumns.filter(col =>
      firstRow[col] === undefined || firstRow[col] === null || firstRow[col] === ''
    );

@@ -162,7 +162,7 @@ export async function POST(request: NextRequest) {
      try {
        // Validate and convert data types
        const semester = parseInt(row.semester);
-        
+
        // Handle decimal comma (Indonesian format) and convert to dot
        const nilaiAngkaStr = row.nilai_angka.toString().replace(',', '.');
        const nilai_angka = parseFloat(nilaiAngkaStr);
@@ -207,7 +207,7 @@ export async function POST(request: NextRequest) {

    if (errors.length > 0) {
      return NextResponse.json(
-        { 
+        {
          message: 'Validation errors found',
          errors: errors.slice(0, 10) // Limit to first 10 errors
        },
@@ -241,7 +241,7 @@ export async function POST(request: NextRequest) {
    const nimToIdMap = new Map(existingMahasiswa?.map(m => [m.nim, m.id_mahasiswa]) || []);
    const kodeMKToIdMap = new Map(existingMataKuliah?.map(mk => [mk.kode_mk, mk.id_mk]) || []);

-    // Process data for insertion
+    // Process data for insertion/update
    const insertData: any[] = [];
    const validationErrors: string[] = [];

@@ -271,7 +271,7 @@ export async function POST(request: NextRequest) {

    if (validationErrors.length > 0) {
      return NextResponse.json(
-        { 
+        {
          message: 'Data validation errors',
          errors: validationErrors.slice(0, 10)
        },
@@ -279,26 +279,88 @@ export async function POST(request: NextRequest) {
      );
    }

-    // Insert data to database
-    let successCount = 0;
-    if (insertData.length > 0) {
+    // Fetch existing nilai_mahasiswa to determine which to update vs insert
+    const { data: existingNilai, error: fetchNilaiError } = await supabase
+      .from('nilai_mahasiswa')
+      .select('id_nilai, id_mahasiswa, id_mk');
+
+    if (fetchNilaiError) {
+      return NextResponse.json(
+        { message: 'Failed to fetch existing nilai data' },
+        { status: 500 }
+      );
+    }
+
+    // Create map of existing nilai: "id_mahasiswa-id_mk" -> id_nilai
+    const existingNilaiMap = new Map(
+      (existingNilai || []).map(n => [`${n.id_mahasiswa}-${n.id_mk}`, n.id_nilai])
+    );
+
+    // Separate data into updates and inserts
+    const dataToUpdate: any[] = [];
+    const dataToInsert: any[] = [];
+
+    for (const data of insertData) {
+      const key = `${data.id_mahasiswa}-${data.id_mk}`;
+      const existingId = existingNilaiMap.get(key);
+
+      if (existingId) {
+        // Data exists, prepare for update
+        dataToUpdate.push({
+          id_nilai: existingId,
+          ...data,
+          updated_at: new Date().toISOString()
+        });
+      } else {
+        // Data doesn't exist, prepare for insert
+        dataToInsert.push(data);
+      }
+    }
+
+    let insertCount = 0;
+    let updateCount = 0;
+
+    // Perform batch insert
+    if (dataToInsert.length > 0) {
      const { error: insertError } = await supabase
        .from('nilai_mahasiswa')
-        .insert(insertData);
+        .insert(dataToInsert);

      if (insertError) {
+        console.error('Insert error:', insertError);
        return NextResponse.json(
-          { message: 'Failed to insert data to database' },
+          { message: 'Failed to insert data to database', error: insertError.message },
          { status: 500 }
        );
      }

-      successCount = insertData.length;
+      insertCount = dataToInsert.length;
+    }
+
+    // Perform batch update (one by one because Supabase doesn't support batch update easily)
+    if (dataToUpdate.length > 0) {
+      for (const data of dataToUpdate) {
+        const { id_nilai, ...updateFields } = data;
+
+        const { error: updateError } = await supabase
+          .from('nilai_mahasiswa')
+          .update(updateFields)
+          .eq('id_nilai', id_nilai);
+
+        if (updateError) {
+          console.error('Update error:', updateError);
+          // Continue with other updates even if one fails
+        } else {
+          updateCount++;
+        }
+      }
    }

    return NextResponse.json({
      message: 'Upload completed',
-      successCount,
+      inserted: insertCount,
+      updated: updateCount,
+      totalProcessed: insertCount + updateCount,
      totalRows: processedData.length
    });

--- a/app/api/mahasiswa/terancamdo/route.ts
+++ b/app/api/mahasiswa/terancamdo/route.ts
@@ -147,10 +147,10 @@ export async function GET() {
      ) {
        isDO = 1;
      }
-      // Evaluasi akhir masa studi: semester = 12 AND (sks_total < 144 OR ipk <= 2.00 OR jumlah_e > 0 OR sks_d > 14 OR min_wajib < 2.00 OR lulus_ta1 = 0 OR lulus_ta2 = 0)
+      // Evaluasi akhir masa studi: semester lebih besar atau sama dengan 12 AND (sks_total < 144 OR ipk <= 2.00 OR jumlah_e > 0 OR sks_d > 14 OR min_wajib < 2.00 OR lulus_ta1 = 0 OR lulus_ta2 = 0)
      // Di SQL: lulus_ta1 = 0 akan TRUE jika lulus_ta1 adalah 0, FALSE jika NULL atau 1
      else if (
-        sem === 12 &&
+        sem >= 12 &&
        sksTotal !== null && // Pastikan ada data nilai
        (
          sksTotal < 144 ||
--- a/app/api/tabeldetail/terancam-do/route.ts
+++ b/app/api/tabeldetail/terancam-do/route.ts
@@ -170,7 +170,7 @@ export async function GET(request: NextRequest) {
      }
      // Evaluasi akhir masa studi: semester = 14
      else if (
-        sem === 12 &&
+        sem >= 12 &&
        sksTotal !== null &&
        (
          sksTotal < 144 ||
--- a/app/detail/terancam-do/page.tsx
+++ b/app/detail/terancam-do/page.tsx
@@ -43,9 +43,9 @@ export default function TerancamDODetailPage() {
                <li>• Menampilkan jumlah mahasiswa yang terancam drop out (DO) per tahun angkatan</li>
                <li>• Evaluasi dilakukan berdasarkan pedoman akademik UNTAN tahun 2023/2024</li>
                <li>• Kriteria evaluasi terdiri dari tiga tahap (evaluasi dilakukan sebelum semester target):</li>
-                <li className="ml-4">- <strong>Evaluasi semester 3</strong>: SKS minimal 40 dan IPK &gt; 2.50 (sebelum masuk semester 4)</li>
-                <li className="ml-4">- <strong>Evaluasi semester 7</strong>: SKS minimal 80 dan IPK &gt; 2.50 (sebelum masuk semester 8)</li>
-                <li className="ml-4">- <strong>Evaluasi semester 12</strong>: SKS minimal 144, IPK &gt; 2.00, tidak ada nilai E, nilai D maksimal 10%, nilai mata kuliah wajib minimal C, dan lulus tugas akhir (sebelum semester 14)</li>
+                <li className="ml-4">- <strong>Evaluasi semester 3</strong>: SKS minimal 40 dan IPK &le; 2.50 (sebelum masuk semester 4)</li>
+                <li className="ml-4">- <strong>Evaluasi semester 7</strong>: SKS minimal 80 dan IPK &le; 2.50 (sebelum masuk semester 8)</li>
+                <li className="ml-4">- <strong>Evaluasi semester 12</strong>: SKS minimal 144, IPK &le; 2.00, tidak ada nilai E, nilai D maksimal 10%, nilai mata kuliah wajib minimal C, dan lulus tugas akhir (sebelum semester 14)</li>
                <li>• Grafik batang vertikal yang menunjukkan jumlah mahasiswa terancam DO per tahun angkatan</li>
                <li>• Data dapat di-download dan dianalisis untuk monitoring akademik</li>
              </ul>
--- a/app/globals.css
+++ b/app/globals.css
@@ -3,6 +3,37 @@

@custom-variant dark (&:is(.dark *));

+/* Custom properties for gradient animation */
+@property --bg-1-x {
+  syntax: "<number>";
+  inherits: true;
+  initial-value: 25;
+}
+
+@property --bg-2-x {
+  syntax: "<number>";
+  inherits: true;
+  initial-value: 35;
+}
+
+@property --bg-2-y {
+  syntax: "<number>";
+  inherits: true;
+  initial-value: 40;
+}
+
+@property --bg-3-x {
+  syntax: "<number>";
+  inherits: true;
+  initial-value: 45;
+}
+
+@property --bg-3-y {
+  syntax: "<number>";
+  inherits: true;
+  initial-value: 20;
+}
+
@theme inline {
  --color-background: var(--background);
  --color-foreground: var(--foreground);
@@ -120,3 +151,153 @@
    @apply bg-background text-foreground;
  }
 }
+
+/* Gradient text animation keyframes */
+@keyframes gradient-bg-animate {
+  0% {
+    --bg-1-x: 25;
+    --bg-2-y: 40;
+    --bg-2-x: 35;
+    --bg-3-y: 20;
+    --bg-3-x: 45;
+  }
+
+  25% {
+    --bg-1-x: 30;
+    --bg-2-y: 50;
+    --bg-2-x: 80;
+    --bg-3-y: 20;
+    --bg-3-x: 70;
+  }
+
+  50% {
+    --bg-1-x: 10;
+    --bg-2-y: 40;
+    --bg-2-x: 30;
+    --bg-3-y: 80;
+    --bg-3-x: 50;
+  }
+
+  75% {
+    --bg-1-x: 70;
+    --bg-2-y: 10;
+    --bg-2-x: 50;
+    --bg-3-y: 30;
+    --bg-3-x: 40;
+  }
+
+  100% {
+    --bg-1-x: 25;
+    --bg-2-y: 40;
+    --bg-2-x: 35;
+    --bg-3-y: 20;
+    --bg-3-x: 45;
+  }
+}
+
+/* Gradient text utility class */
+.gradient-text-animated {
+  background-image: 
+    linear-gradient(
+      135deg,
+      #ffffff 0%,
+      #3b82f6 12%,
+      #10b981 24%,
+      #f59e0b 36%,
+      #ef4444 48%,
+      #8b5cf6 60%,
+      #06b6d4 72%,
+      #ec4899 84%,
+      #ffffff 100%
+    );
+  background-size: 300% 300%;
+  background-position: calc(var(--bg-1-x) * 2%) 50%;
+  -webkit-background-clip: text;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+  animation: gradient-bg-animate 20s ease-in-out infinite alternate;
+}
+
+/* Glass effect with grain texture */
+.glass-effect {
+  background: rgba(30, 41, 59, 0.7);
+  backdrop-filter: blur(20px) saturate(180%);
+  -webkit-backdrop-filter: blur(20px) saturate(180%);
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  box-shadow: 
+    0 8px 32px 0 rgba(0, 0, 0, 0.37),
+    inset 0 1px 0 0 rgba(255, 255, 255, 0.05);
+  position: relative;
+}
+
+.glass-effect::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  border-radius: inherit;
+  background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 600 600' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='noiseFilter'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.9' numOctaves='4' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23noiseFilter)'/%3E%3C/svg%3E");
+  background-size: 200px;
+  opacity: 0.03;
+  pointer-events: none;
+  mix-blend-mode: overlay;
+}
+
+/* Glass input field */
+.glass-input {
+  background: rgba(15, 23, 42, 0.5);
+  backdrop-filter: blur(10px);
+  -webkit-backdrop-filter: blur(10px);
+  border: 1px solid rgba(255, 255, 255, 0.08);
+  transition: all 0.3s ease;
+}
+
+.glass-input:focus {
+  background: rgba(15, 23, 42, 0.7);
+  border-color: rgba(59, 130, 246, 0.5);
+  box-shadow: 
+    0 0 0 3px rgba(59, 130, 246, 0.1),
+    inset 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+
+/* Glass button */
+.glass-button {
+  background: linear-gradient(135deg, rgba(59, 130, 246, 0.7), rgba(37, 99, 235, 0.8));
+  backdrop-filter: blur(10px);
+  -webkit-backdrop-filter: blur(10px);
+  border: 1px solid rgba(59, 130, 246, 0.3);
+  box-shadow: 
+    0 2px 8px rgba(59, 130, 246, 0.2),
+    inset 0 1px 0 rgba(255, 255, 255, 0.05);
+  transition: all 0.3s ease;
+}
+
+.glass-button:hover:not(:disabled) {
+  background: linear-gradient(135deg, rgba(37, 99, 235, 0.8), rgba(29, 78, 216, 0.9));
+  box-shadow: 
+    0 4px 12px rgba(59, 130, 246, 0.3),
+    inset 0 1px 0 rgba(255, 255, 255, 0.08);
+  transform: translateY(-1px);
+}
+
+.glass-button:disabled {
+  background: linear-gradient(135deg, rgba(59, 130, 246, 0.4), rgba(37, 99, 235, 0.5));
+  opacity: 0.7;
+  cursor: not-allowed;
+}
+
+/* Glass tab button */
+.glass-tab {
+  background: rgba(15, 23, 42, 0.3);
+  backdrop-filter: blur(8px);
+  -webkit-backdrop-filter: blur(8px);
+  border: 1px solid rgba(255, 255, 255, 0.06);
+  transition: all 0.2s ease;
+}
+
+.glass-tab-active {
+  background: linear-gradient(135deg, rgba(59, 130, 246, 0.6), rgba(37, 99, 235, 0.7));
+  border-color: rgba(59, 130, 246, 0.3);
+  box-shadow: 
+    0 2px 8px rgba(59, 130, 246, 0.2),
+    inset 0 1px 0 rgba(255, 255, 255, 0.05);
+}
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -95,7 +95,7 @@ export default function HomePage() {
      <div className="w-full max-w-sm mx-auto p-4 relative z-10">
        {/* Header */}
        <div className="text-center space-y-3 mb-6">
-          <h1 className="text-3xl font-bold text-white">
+          <h1 className="text-2xl md:text-2xl lg:text-3xl font-bold gradient-text-animated leading-tight">
            Portal Data Informatika
          </h1>
        </div>
@@ -195,10 +195,7 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
  };

  return (
-    <div className="bg-slate-800/95 backdrop-blur-md rounded-xl shadow-xl p-6 w-full border border-slate-600/50 relative">
-      {/* Subtle glow effect */}
-      <div className="absolute inset-0 bg-gradient-to-r from-blue-500/5 to-purple-500/5 rounded-xl"></div>
-      
+    <div className="glass-effect rounded-2xl shadow-2xl p-6 w-full relative overflow-hidden">
      <div className="relative z-10">
        <div className="text-center mb-6">
          <h2 className="text-xl font-bold text-white mb-1">
@@ -210,24 +207,24 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
        </div>

      <div className="space-y-4">
-        {/* Tab buttons */}
-        <div className="flex rounded-lg bg-slate-700/50 p-1 border border-slate-600">
+        {/* Tab buttons with glass effect */}
+        <div className="flex rounded-xl glass-tab p-1">
          <button
            onClick={() => setActiveTab("ketua")}
-            className={`flex-1 py-2 px-3 rounded-md text-sm font-medium transition-all duration-200 ${
+            className={`flex-1 py-2 px-3 rounded-md text-sm font-semibold transition-all duration-200 ${
              activeTab === "ketua"
-                ? "bg-blue-600 text-white shadow-md"
-                : "text-slate-300 hover:text-white hover:bg-slate-600/50"
+                ? "glass-tab-active text-white"
+                : "text-slate-300 hover:text-white hover:bg-white/5"
            }`}
          >
            Pimpinan
          </button>
          <button
            onClick={() => setActiveTab("admin")}
-            className={`flex-1 py-2 px-3 rounded-md text-sm font-medium transition-all duration-200 ${
+            className={`flex-1 py-2 px-3 rounded-md text-sm font-semibold transition-all duration-200 ${
              activeTab === "admin"
-                ? "bg-blue-600 text-white shadow-md"
-                : "text-slate-300 hover:text-white hover:bg-slate-600/50"
+                ? "glass-tab-active text-white"
+                : "text-slate-300 hover:text-white hover:bg-white/5"
            }`}
          >
            Admin
@@ -238,7 +235,7 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
        {activeTab === "ketua" && (
          <form onSubmit={handleKetuaLogin} className="space-y-4">
            <div className="space-y-1">
-              <label htmlFor="nip" className="block text-sm font-medium text-slate-200">
+              <label htmlFor="nip" className="block text-sm font-medium text-white/90">
                NIP
              </label>
              <input
@@ -248,11 +245,11 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
                value={ketuaForm.nip}
                onChange={(e) => setKetuaForm({ ...ketuaForm, nip: e.target.value })}
                required
-                className="w-full px-3 py-2 bg-slate-700/50 border border-slate-600 rounded-lg text-white placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all duration-200"
+                className="glass-input w-full px-3 py-2 rounded-lg text-white placeholder-slate-400 focus:outline-none"
              />
            </div>
            <div className="space-y-1">
-              <label htmlFor="ketua-password" className="block text-sm font-medium text-slate-200">
+              <label htmlFor="ketua-password" className="block text-sm font-medium text-white/90">
                Password
              </label>
              <input
@@ -262,13 +259,13 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
                value={ketuaForm.password}
                onChange={(e) => setKetuaForm({ ...ketuaForm, password: e.target.value })}
                required
-                className="w-full px-3 py-2 bg-slate-700/50 border border-slate-600 rounded-lg text-white placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all duration-200"
+                className="glass-input w-full px-3 py-2 rounded-lg text-white placeholder-slate-400 focus:outline-none"
              />
            </div>
            <button
              type="submit"
              disabled={isLoading}
-              className="w-full bg-gradient-to-r from-blue-600 to-blue-700 hover:from-blue-700 hover:to-blue-800 disabled:from-blue-400 disabled:to-blue-500 text-white font-medium py-2.5 px-4 rounded-lg transition-all duration-200 shadow-md"
+              className="glass-button w-full text-white font-medium py-2.5 px-4 rounded-lg"
            >
              {isLoading ? (
                <div className="flex items-center justify-center">
@@ -286,7 +283,7 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
        {activeTab === "admin" && (
          <form onSubmit={handleAdminLogin} className="space-y-4">
            <div className="space-y-1">
-              <label htmlFor="username" className="block text-sm font-medium text-slate-200">
+              <label htmlFor="username" className="block text-sm font-medium text-white/90">
                Username
              </label>
              <input
@@ -296,11 +293,11 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
                value={adminForm.username}
                onChange={(e) => setAdminForm({ ...adminForm, username: e.target.value })}
                required
-                className="w-full px-3 py-2 bg-slate-700/50 border border-slate-600 rounded-lg text-white placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all duration-200"
+                className="glass-input w-full px-3 py-2 rounded-lg text-white placeholder-slate-400 focus:outline-none"
              />
            </div>
            <div className="space-y-1">
-              <label htmlFor="admin-password" className="block text-sm font-medium text-slate-200">
+              <label htmlFor="admin-password" className="block text-sm font-medium text-white/90">
                Password
              </label>
              <input
@@ -310,13 +307,13 @@ function AutoLoginDialog({ onLoginSuccess }: AutoLoginDialogProps) {
                value={adminForm.password}
                onChange={(e) => setAdminForm({ ...adminForm, password: e.target.value })}
                required
-                className="w-full px-3 py-2 bg-slate-700/50 border border-slate-600 rounded-lg text-white placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent transition-all duration-200"
+                className="glass-input w-full px-3 py-2 rounded-lg text-white placeholder-slate-400 focus:outline-none"
              />
            </div>
            <button
              type="submit"
              disabled={isLoading}
-              className="w-full bg-gradient-to-r from-blue-600 to-blue-700 hover:from-blue-700 hover:to-blue-800 disabled:from-blue-400 disabled:to-blue-500 text-white font-medium py-2.5 px-4 rounded-lg transition-all duration-200 shadow-md"
+              className="glass-button w-full text-white font-medium py-2.5 px-4 rounded-lg"
            >
              {isLoading ? (
                <div className="flex items-center justify-center">
--- a/components/charts/JenisPendaftaranPerAngkatanChart.tsx
+++ b/components/charts/JenisPendaftaranPerAngkatanChart.tsx
@@ -26,6 +26,7 @@ export default function JenisPendaftaranPerAngkatanChart({ tahunAngkatan }: Prop
  const [error, setError] = useState<string | null>(null);
  const [data, setData] = useState<JenisPendaftaranData[]>([]);
  const [series, setSeries] = useState<number[]>([]);
+  const [chartColors, setChartColors] = useState<string[]>([]);
  const [options, setOptions] = useState<ApexOptions>({
    chart: {
      type: 'pie',
@@ -43,7 +44,7 @@ export default function JenisPendaftaranPerAngkatanChart({ tahunAngkatan }: Prop
      }
    },
    labels: [],
-    colors: ['#3B82F6', '#10B981', '#F59E0B', '#EF4444', '#8B5CF6', '#EC4899', '#06B6D4', '#F97316'],
+    colors: [],
    legend: {
      position: 'bottom',
      fontSize: '14px',
@@ -101,9 +102,11 @@ export default function JenisPendaftaranPerAngkatanChart({ tahunAngkatan }: Prop
      tooltip: {
        ...prev.tooltip,
        theme: theme === 'dark' ? 'dark' : 'light'
-      }
+      },
+      // Preserve computed colors across theme changes
+      colors: chartColors.length > 0 ? chartColors : prev.colors,
    }));
-  }, [theme]);
+  }, [theme, chartColors]);
  
  // Update dataLabels formatter when data changes
  useEffect(() => {
@@ -141,29 +144,46 @@ export default function JenisPendaftaranPerAngkatanChart({ tahunAngkatan }: Prop
        setLoading(true);
        setError(null);
        
-        const response = await fetch(`/api/mahasiswa/jenis-pendaftaran?tahun_angkatan=${tahunAngkatan}`);
+        // Fetch year-filtered data and global data in parallel
+        const [response, allResponse] = await Promise.all([
+          fetch(`/api/mahasiswa/jenis-pendaftaran?tahun_angkatan=${tahunAngkatan}`),
+          fetch('/api/mahasiswa/jenis-pendaftaran'),
+        ]);
        
        if (!response.ok) {
          throw new Error(`Failed to fetch data: ${response.status} ${response.statusText}`);
        }
        
        const result = await response.json();
+        const allResult = allResponse.ok ? await allResponse.json() : result;
        
        if (!Array.isArray(result)) {
          throw new Error('Invalid data format received from server');
        }

+        // Build global sorted jenis list (same order as bar chart) for stable color assignment
+        const colorPalette = ['#3B82F6', '#10B981', '#F59E0B', '#EF4444', '#8B5CF6', '#EC4899', '#06B6D4', '#F97316'];
+        const allJenis: string[] = [...new Set((allResult as any[]).map(item => item.jenis_pendaftaran as string))].sort() as string[];
+
        // Process data for pie chart
-        const jenisPendaftaran = [...new Set(result.map(item => item.jenis_pendaftaran))].sort();
-        const jumlahData = jenisPendaftaran.map(jenis => {
-          const item = result.find(d => d.jenis_pendaftaran === jenis);
+        const jenisPendaftaran = [...new Set(result.map(item => item.jenis_pendaftaran))].sort() as string[];
+        const jumlahData = jenisPendaftaran.map((jenis: string) => {
+          const item = result.find((d: any) => d.jenis_pendaftaran === jenis);
          return item ? item.jumlah : 0;
        });

+        // Assign colors based on global sorted position to match bar chart colors
+        const computedColors = jenisPendaftaran.map((jenis: string) => {
+          const idx = allJenis.indexOf(jenis);
+          return idx >= 0 ? colorPalette[idx % colorPalette.length] : '#999999';
+        });
+
+        setChartColors(computedColors);
        setSeries(jumlahData);
        setOptions(prev => ({
          ...prev,
          labels: jenisPendaftaran,
+          colors: computedColors,
        }));
        
        // Store processed data
--- a/components/charts/StatistikMahasiswaChart.tsx
+++ b/components/charts/StatistikMahasiswaChart.tsx
@@ -73,15 +73,10 @@ export default function StatistikMahasiswaChart({
        const seriesIndex = opts.seriesIndex;
        const dataPointIndex = opts.dataPointIndex;
        
-        // Jika series Total (index 2), tampilkan angka
-        if (seriesIndex === 2) {
-          return val.toString();
-        }
-        
-        // Untuk Laki-laki (index 0) dan Perempuan (index 1), hitung persentase
-        // Ambil data total dari series Total (index 2)
-        const totalSeriesData = opts.w.config.series[2]?.data || [];
-        const totalValue = totalSeriesData[dataPointIndex] || 0;
+        // Hitung total dari Laki-laki (index 0) dan Perempuan (index 1)
+        const lakiLakiData = opts.w.config.series[0]?.data || [];
+        const perempuanData = opts.w.config.series[1]?.data || [];
+        const totalValue = (lakiLakiData[dataPointIndex] || 0) + (perempuanData[dataPointIndex] || 0);
        
        if (totalValue === 0 || val === 0) return '0%';
        
@@ -97,7 +92,7 @@ export default function StatistikMahasiswaChart({
    stroke: {
      show: true,
      width: 2,
-      colors: ['transparent', 'transparent', 'transparent'],
+      colors: ['transparent', 'transparent'],
      curve: 'straight' as const
    },
    xaxis: {
@@ -153,7 +148,7 @@ export default function StatistikMahasiswaChart({
        colors: '#000'
      }
    },
-    colors: ['#3B82F6', '#EC4899', '#10B981'],
+    colors: ['#3B82F6', '#EC4899'],
    tooltip: {
      theme: 'light',
      shared: true,
@@ -161,7 +156,7 @@ export default function StatistikMahasiswaChart({
      custom: function({ series, seriesIndex, dataPointIndex, w }: any) {
        const lakiLaki = series[0][dataPointIndex];
        const perempuan = series[1][dataPointIndex];
-        const total = series[2][dataPointIndex];
+        const total = lakiLaki + perempuan;
        const tahun = w.globals.labels[dataPointIndex];
        
        return `
@@ -199,7 +194,6 @@ export default function StatistikMahasiswaChart({
              display: flex; 
              align-items: center;
            ">
-              <div style="width: 8px; height: 8px; background: #10B981; border-radius: 50%; margin-right: 8px;"></div>
              <span style="font-size: 12px; font-weight: 600; color: #1f2937;">Total</span>
              <span style="font-size: 13px; font-weight: 700; color: #10B981; margin-left: auto;">${total}</span>
            </div>
@@ -248,18 +242,11 @@ export default function StatistikMahasiswaChart({
      dataLabels: {
        ...prev.dataLabels,
        formatter: function (val: number, opts: any) {
-          const seriesIndex = opts.seriesIndex;
          const dataPointIndex = opts.dataPointIndex;
          
-          // Jika series Total (index 2), tampilkan angka
-          if (seriesIndex === 2) {
-            return val.toString();
-          }
-          
-          // Untuk Laki-laki (index 0) dan Perempuan (index 1), hitung persentase
-          // Ambil data total dari series Total (index 2)
-          const totalSeriesData = opts.w.config.series[2]?.data || [];
-          const totalValue = totalSeriesData[dataPointIndex] || 0;
+          const lakiLakiData = opts.w.config.series[0]?.data || [];
+          const perempuanData = opts.w.config.series[1]?.data || [];
+          const totalValue = (lakiLakiData[dataPointIndex] || 0) + (perempuanData[dataPointIndex] || 0);
          
          if (totalValue === 0 || val === 0) return '0%';
          
@@ -320,13 +307,9 @@ export default function StatistikMahasiswaChart({
        custom: function({ series, seriesIndex, dataPointIndex, w }: any) {
          const lakiLaki = series[0][dataPointIndex];
          const perempuan = series[1][dataPointIndex];
-          const total = series[2][dataPointIndex];
+          const total = lakiLaki + perempuan;
          const tahun = w.globals.labels[dataPointIndex];
          
-          const bgColor = currentTheme === 'dark' ? '#1e293b' : 'white';
-          const textColor = currentTheme === 'dark' ? '#fff' : '#000';
-          const borderColor = currentTheme === 'dark' ? '#475569' : '#ccc';
-          
          const isDark = currentTheme === 'dark';
          
          return `
@@ -364,7 +347,6 @@ export default function StatistikMahasiswaChart({
                display: flex; 
                align-items: center;
              ">
-                <div style="width: 8px; height: 8px; background: #10B981; border-radius: 50%; margin-right: 8px;"></div>
                <span style="font-size: 12px; font-weight: 600; color: ${isDark ? '#f1f5f9' : '#1f2937'};">Total</span>
                <span style="font-size: 13px; font-weight: 700; color: #10B981; margin-left: auto;">${total}</span>
              </div>
@@ -404,11 +386,6 @@ export default function StatistikMahasiswaChart({
      name: 'Perempuan',
      type: 'bar' as const,
      data: statistikData.map(item => item.wanita)
-    },
-    {
-      name: 'Total',
-      type: 'bar' as const,
-      data: statistikData.map(item => item.total_mahasiswa)
    }
  ];

--- a/components/charts/StatusMahasiswaFilterPieChart.tsx
+++ b/components/charts/StatusMahasiswaFilterPieChart.tsx
@@ -70,7 +70,7 @@ export default function StatusMahasiswaFilterPieChart({ selectedYear, selectedSt
      background: theme === 'dark' ? '#0F172B' : '#fff',
    },
    labels: ['Laki-laki', 'Perempuan'],
-    colors: ['#3B82F6', '#EC4899'],
+    colors: ['#008FFB', '#EC4899'],
    legend: {
      position: 'bottom',
      fontSize: '14px',
--- a/components/chartsDashboard/DistribusiIPKChartPerangkatan.tsx
+++ b/components/chartsDashboard/DistribusiIPKChartPerangkatan.tsx
@@ -81,9 +81,18 @@ export default function DistribusiIPKChartPerangkatan({ selectedYear }: Props) {
    fetchData();
  }, [selectedYear]);

+  // Fixed color map consistent with bar chart (DistribusiIPKChart)
+  const KATEGORI_COLOR_MAP: { [key: string]: string } = {
+    'Sangat Baik': '#008FFB',
+    'Baik': '#00E396',
+    'Cukup': '#FEB019',
+    'Kurang': '#EF4444',
+  };
+
  // Prepare data for pie chart
  const series = data.map(item => item.jumlah);
  const labels = data.map(item => kategoriLabelsMap[item.kategori_ipk] || item.kategori_ipk);
+  const colors = data.map(item => KATEGORI_COLOR_MAP[item.kategori_ipk] || '#999999');

  const chartOptions: ApexOptions = {
    chart: {
@@ -122,12 +131,7 @@ export default function DistribusiIPKChartPerangkatan({ selectedYear }: Props) {
        return seriesName;
      }
    },
-    colors: [
-      '#008FFB', // Sangat Baik - Blue
-      '#00E396', // Baik - Green
-      '#FEB019', // Cukup - Orange
-      '#EF4444', // Kurang - Red
-    ],
+    colors: colors,
    tooltip: {
      theme: theme === 'dark' ? 'dark' : 'light',
      y: {
--- a/components/chartsDashboard/NamaBeasiswaDashPieChartPerangkatan.tsx
+++ b/components/chartsDashboard/NamaBeasiswaDashPieChartPerangkatan.tsx
@@ -20,6 +20,7 @@ interface Props {
 export default function NamaBeasiswaDashPieChartPerangkatan({ selectedYear }: Props) {
  const { theme } = useTheme();
  const [data, setData] = useState<NamaBeasiswaPerAngkatanData[]>([]);
+  const [chartColors, setChartColors] = useState<string[]>([]);
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState<string | null>(null);

@@ -43,6 +44,11 @@ export default function NamaBeasiswaDashPieChartPerangkatan({ selectedYear }: Pr
          throw new Error('Invalid data format received from server');
        }
        
+        // Build global alphabetical list from all data (same order as bar chart)
+        const colorPalette = ['#3B82F6', '#EC4899', '#10B981', '#F59E0B', '#EF4444', '#8B5CF6', '#06B6D4'];
+        const allBeasiswa: string[] = [...new Set((result as any[]).map((item: any) => item.nama_beasiswa as string))]
+          .sort();
+
        // Filter data for selected year and group by nama_beasiswa
        const yearData = result.filter((item: any) => 
          item.tahun_angkatan.toString() === selectedYear
@@ -55,14 +61,20 @@ export default function NamaBeasiswaDashPieChartPerangkatan({ selectedYear }: Pr
          return acc;
        }, {});

-        // Convert to array format
+        // Convert to array format and sort by count descending (display order)
        const chartData = Object.entries(groupedData).map(([nama_beasiswa, jumlah_nama_beasiswa]) => ({
          nama_beasiswa,
          jumlah_nama_beasiswa: jumlah_nama_beasiswa as number
        }));
-
-        // Sort by jumlah_nama_beasiswa descending
        const sortedData = chartData.sort((a, b) => (b.jumlah_nama_beasiswa as number) - (a.jumlah_nama_beasiswa as number));
+
+        // Assign colors based on global alphabetical position to match bar chart
+        const computedColors = sortedData.map(item => {
+          const idx = allBeasiswa.indexOf(item.nama_beasiswa);
+          return idx >= 0 ? colorPalette[idx % colorPalette.length] : '#999999';
+        });
+
+        setChartColors(computedColors);
        setData(sortedData);
      } catch (err) {
        console.error('Error in fetchData:', err);
@@ -122,7 +134,7 @@ export default function NamaBeasiswaDashPieChartPerangkatan({ selectedYear }: Pr
        colors: theme === 'dark' ? '#fff' : '#000'
      }
    },
-    colors: [
+    colors: chartColors.length > 0 ? chartColors : [
      '#3B82F6', // Blue
      '#EC4899', // Pink
      '#10B981', // Green
--- a/components/chartsDashboard/StatusMahasiswaPieChartPerangkatan.tsx
+++ b/components/chartsDashboard/StatusMahasiswaPieChartPerangkatan.tsx
@@ -65,9 +65,18 @@ export default function StatusMahasiswaPieChartPerangkatan({ selectedYear }: Pro
    fetchData();
  }, [selectedYear]);

+  // Color mapping consistent with StatusMahasiswaChart bar chart
+  const STATUS_COLOR_MAP: { [key: string]: string } = {
+    'Aktif': '#008FFB',
+    'Lulus': '#00E396',
+    'Cuti': '#FEB019',
+    'Non Aktif': '#EF4444',
+  };
+
  // Prepare data for pie chart
  const series = data.map(item => item.jumlah);
  const labels = data.map(item => item.status_kuliah);
+  const colors = data.map(item => STATUS_COLOR_MAP[item.status_kuliah] || '#775DD0');

  const chartOptions: ApexOptions = {
    chart: {
@@ -103,13 +112,7 @@ export default function StatusMahasiswaPieChartPerangkatan({ selectedYear }: Pro
        colors: theme === 'dark' ? '#fff' : '#000'
      }
    },
-    colors: [
-      '#00E396', // Aktif - Green
-      '#008FFB', // Lulus - Blue
-      '#FEB019', // Cuti - Orange
-      '#FF4560', // Non-Aktif - Red
-      '#775DD0', // Lainnya - Purple
-    ],
+    colors: colors,
    tooltip: {
      theme: theme === 'dark' ? 'dark' : 'light',
      y: {
--- a/components/chartsDashboard/kkdashboardpiechartperangkatan.tsx
+++ b/components/chartsDashboard/kkdashboardpiechartperangkatan.tsx
@@ -20,6 +20,7 @@ interface Props {
 export default function KelompokKeahlianPieChartPerAngkatan({ selectedYear }: Props) {
  const { theme } = useTheme();
  const [data, setData] = useState<KelompokKeahlianPerAngkatanData[]>([]);
+  const [chartColors, setChartColors] = useState<string[]>([]);
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState<string | null>(null);

@@ -27,14 +28,23 @@ export default function KelompokKeahlianPieChartPerAngkatan({ selectedYear }: Pr
    const fetchData = async () => {
      try {
        setLoading(true);
-        const response = await fetch(
-          `/api/mahasiswa/kk-dashboard?tahun_angkatan=${selectedYear}`
-        );
+
+        // Fetch year-filtered data and global data in parallel
+        const [response, allResponse] = await Promise.all([
+          fetch(`/api/mahasiswa/kk-dashboard?tahun_angkatan=${selectedYear}`),
+          fetch('/api/mahasiswa/kk-dashboard'),
+        ]);
        if (!response.ok) {
          throw new Error('Failed to fetch data');
        }
        const result = await response.json();
-        
+        const allResult = allResponse.ok ? await allResponse.json() : result;
+
+        // Build global alphabetical list of kelompok (same order as bar chart)
+        const colorPalette = ['#008FFB', '#00E396', '#FEB019', '#FF4560', '#775DD0', '#8B5CF6', '#EC4899', '#06B6D4', '#F97316'];
+        const allKelompok: string[] = [...new Set((allResult as any[]).map((item: any) => item.nama_kelompok as string))]
+          .sort((a, b) => a.localeCompare(b));
+
        // Group by nama_kelompok and sum jumlah_mahasiswa
        const groupedData = result.reduce((acc: { [key: string]: number }, item: any) => {
          const namaKelompok = item.nama_kelompok || 'Tidak Diketahui';
@@ -42,14 +52,20 @@ export default function KelompokKeahlianPieChartPerAngkatan({ selectedYear }: Pr
          return acc;
        }, {});

-        // Convert to array format
+        // Convert to array format and sort by jumlah_mahasiswa descending (display order)
        const chartData = Object.entries(groupedData).map(([nama_kelompok, jumlah_mahasiswa]) => ({
          nama_kelompok,
          jumlah_mahasiswa: jumlah_mahasiswa as number
        }));
-
-        // Sort by jumlah_mahasiswa descending
        const sortedData = chartData.sort((a, b) => (b.jumlah_mahasiswa as number) - (a.jumlah_mahasiswa as number));
+
+        // Assign colors based on global alphabetical position to match bar chart
+        const computedColors = sortedData.map(item => {
+          const idx = allKelompok.indexOf(item.nama_kelompok);
+          return idx >= 0 ? colorPalette[idx % colorPalette.length] : '#999999';
+        });
+
+        setChartColors(computedColors);
        setData(sortedData);
      } catch (err) {
        setError(err instanceof Error ? err.message : 'An error occurred');
@@ -98,9 +114,7 @@ export default function KelompokKeahlianPieChartPerAngkatan({ selectedYear }: Pr
        colors: theme === 'dark' ? '#fff' : '#000'
      }
    },
-    colors: [
-      '#008FFB', '#00E396', '#FEB019', '#FF4560', '#775DD0', '#8B5CF6', '#EC4899', '#06B6D4', '#F97316'
-    ],
+    colors: chartColors,
    tooltip: {
      theme: theme === 'dark' ? 'dark' : 'light',
      y: {
--- a/components/chartstable/tabelkategoriipkmahasiswa.tsx
+++ b/components/chartstable/tabelkategoriipkmahasiswa.tsx
@@ -199,12 +199,12 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
        </CardTitle>
        {/* Filter Kategori IPK */}
        <div className="flex items-center gap-2 mt-4">
-          <span className="text-sm dark:text-white">Filter Kategori IPK:</span>
+          <span className="text-sm text-gray-900 dark:text-white">Filter Kategori IPK:</span>
          <Select value={selectedKategori} onValueChange={handleKategoriChange}>
-            <SelectTrigger className="w-[220px]">
+            <SelectTrigger className="w-[220px] dark:bg-slate-800 dark:text-white dark:border-slate-700">
              <SelectValue placeholder="Pilih Kategori IPK" />
            </SelectTrigger>
-            <SelectContent>
+            <SelectContent className="dark:bg-slate-800 dark:text-white dark:border-slate-700">
              <SelectItem value="all">Semua Kategori</SelectItem>
              <SelectItem value="Sangat Baik">4.00 - 3.00 Sangat Baik</SelectItem>
              <SelectItem value="Baik">2.99 - 2.50 Baik</SelectItem>
@@ -254,15 +254,15 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
      <CardContent>
        {/* Show entries selector */}
        <div className="flex items-center gap-2 mb-4">
-          <span className="text-sm">Show</span>
+          <span className="text-sm text-gray-900 dark:text-white">Show</span>
          <Select
            value={pageSize.toString()}
            onValueChange={handlePageSizeChange}
          >
-            <SelectTrigger className="w-[80px]">
+            <SelectTrigger className="w-[80px] dark:bg-slate-800 dark:text-white dark:border-slate-700">
              <SelectValue placeholder={pageSize.toString()} />
            </SelectTrigger>
-            <SelectContent>
+            <SelectContent className="dark:bg-slate-800 dark:text-white dark:border-slate-700">
              <SelectItem value="5">5</SelectItem>
              <SelectItem value="10">10</SelectItem>
              <SelectItem value="25">25</SelectItem>
@@ -270,7 +270,7 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
              <SelectItem value="100">100</SelectItem>
            </SelectContent>
          </Select>
-          <span className="text-sm">entries</span>
+          <span className="text-sm text-gray-900 dark:text-white">entries</span>
        </div>

        <div className="border rounded-md overflow-hidden">
@@ -340,7 +340,7 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
        {/* Pagination info and controls */}
        {!loading && !error && filteredData.length > 0 && (
          <div className="flex flex-col sm:flex-row justify-between items-center gap-4 mt-4">
-            <div className="text-sm text-muted-foreground">
+            <div className="text-sm text-gray-600 dark:text-gray-300">
              Showing {getDisplayRange().start} to {getDisplayRange().end} of {filteredData.length} entries
            </div>
            <Pagination>
@@ -348,7 +348,7 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
                <PaginationItem>
                  <PaginationPrevious 
                    onClick={() => handlePageChange(Math.max(1, currentPage - 1))}
-                    className={currentPage === 1 ? "pointer-events-none opacity-50" : "cursor-pointer"}
+                    className={`${currentPage === 1 ? "pointer-events-none opacity-50" : "cursor-pointer"} dark:text-white dark:hover:bg-slate-800`}
                  />
                </PaginationItem>
                
@@ -357,7 +357,7 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
                <PaginationItem>
                  <PaginationNext 
                    onClick={() => handlePageChange(Math.min(getTotalPages(), currentPage + 1))}
-                    className={currentPage === getTotalPages() ? "pointer-events-none opacity-50" : "cursor-pointer"}
+                    className={`${currentPage === getTotalPages() ? "pointer-events-none opacity-50" : "cursor-pointer"} dark:text-white dark:hover:bg-slate-800`}
                  />
                </PaginationItem>
              </PaginationContent>
@@ -389,7 +389,7 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
        <PaginationLink 
          isActive={currentPage === 1} 
          onClick={() => handlePageChange(1)}
-          className="cursor-pointer"
+          className="cursor-pointer dark:text-white dark:hover:bg-slate-800"
        >
          1
        </PaginationLink>
@@ -413,7 +413,7 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
          <PaginationLink 
            isActive={currentPage === i} 
            onClick={() => handlePageChange(i)}
-            className="cursor-pointer"
+            className="cursor-pointer dark:text-white dark:hover:bg-slate-800"
          >
            {i}
          </PaginationLink>
@@ -437,7 +437,7 @@ export default function TabelKategoriIPKMahasiswa({ selectedYear }: TabelKategor
          <PaginationLink 
            isActive={currentPage === totalPages} 
            onClick={() => handlePageChange(totalPages)}
-            className="cursor-pointer"
+            className="cursor-pointer dark:text-white dark:hover:bg-slate-800"
          >
            {totalPages}
          </PaginationLink>
--- a/components/datatable/upload-file-nilai-mahasiswa.tsx
+++ b/components/datatable/upload-file-nilai-mahasiswa.tsx
@@ -3,11 +3,11 @@
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import { 
-  Dialog, 
-  DialogContent, 
-  DialogHeader, 
-  DialogTitle, 
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
  DialogFooter,
  DialogClose
 } from "@/components/ui/dialog";
@@ -34,12 +34,12 @@ export default function UploadFileNilaiMahasiswa({ onUploadSuccess }: UploadFile
        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
        'text/csv'
      ];
-      
+
      if (!validTypes.includes(file.type)) {
        showError("Error!", "File harus berformat Excel (.xlsx, .xls) atau CSV (.csv)");
        return;
      }
-      
+
      setSelectedFile(file);
    }
  };
@@ -53,17 +53,17 @@ export default function UploadFileNilaiMahasiswa({ onUploadSuccess }: UploadFile

    try {
      setIsUploading(true);
-      
+
      const formData = new FormData();
      formData.append('file', selectedFile);
-      
+
      const response = await fetch('/api/keloladata/data-nilai-mahasiswa/upload', {
        method: 'POST',
        body: formData,
      });
-      
+
      const result = await response.json();
-      
+
      if (!response.ok) {
        let errorMessage = result.message || 'Upload failed';
        if (result.errors && result.errors.length > 0) {
@@ -71,12 +71,26 @@ export default function UploadFileNilaiMahasiswa({ onUploadSuccess }: UploadFile
        }
        throw new Error(errorMessage);
      }
-      
-      showSuccess("Berhasil!", `${result.successCount} nilai mahasiswa berhasil diimport`);
+
+      // Create success message based on insert and update counts
+      const inserted = result.inserted || 0;
+      const updated = result.updated || 0;
+      const total = inserted + updated;
+
+      let successMessage = `${total} nilai mahasiswa berhasil diproses`;
+      if (inserted > 0 && updated > 0) {
+        successMessage += ` (${inserted} ditambahkan, ${updated} diperbarui)`;
+      } else if (inserted > 0) {
+        successMessage += ` (${inserted} ditambahkan)`;
+      } else if (updated > 0) {
+        successMessage += ` (${updated} diperbarui)`;
+      }
+
+      showSuccess("Berhasil!", successMessage);
      onUploadSuccess();
      setIsDialogOpen(false);
      setSelectedFile(null);
-      
+
      // Reset file input
      const fileInput = document.getElementById('file-upload-nilai') as HTMLInputElement;
      if (fileInput) {
@@ -105,7 +119,7 @@ export default function UploadFileNilaiMahasiswa({ onUploadSuccess }: UploadFile
              Import Data Nilai Mahasiswa
            </DialogTitle>
          </DialogHeader>
-          
+
          <div className="space-y-4 py-4">
            <div className="space-y-2">
              <label htmlFor="file-upload-nilai" className="text-sm font-medium">
@@ -122,7 +136,7 @@ export default function UploadFileNilaiMahasiswa({ onUploadSuccess }: UploadFile
                Format yang didukung: .xlsx, .xls, .csv (Max: 10MB)
              </p>
            </div>
-            
+
            {selectedFile && (
              <div className="p-3 bg-muted rounded-md">
                <p className="text-sm font-medium">File terpilih:</p>
@@ -132,7 +146,7 @@ export default function UploadFileNilaiMahasiswa({ onUploadSuccess }: UploadFile
                </p>
              </div>
            )}
-            
+
            <div className="border-t pt-4">
              <h4 className="text-sm font-medium mb-2">Format File:</h4>
              <div className="text-xs text-muted-foreground space-y-1">
@@ -145,15 +159,15 @@ export default function UploadFileNilaiMahasiswa({ onUploadSuccess }: UploadFile
              </div>
            </div>
          </div>
-          
+
          <DialogFooter>
            <DialogClose asChild>
              <Button variant="outline">
                Batal
              </Button>
            </DialogClose>
-            <Button 
-              onClick={handleUpload} 
+            <Button
+              onClick={handleUpload}
              disabled={!selectedFile || isUploading}
            >
              {isUploading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
--- a/components/ui/Navbar.tsx
+++ b/components/ui/Navbar.tsx
@@ -61,9 +61,13 @@ const Navbar = () => {
  const checkUserSession = async () => {
    try {
      const response = await fetch('/api/auth/user');
+      console.log('Session check response:', response.status);
      if (response.ok) {
        const data = await response.json();
+        console.log('User data:', data);
        setUser(data.user);
+      } else {
+        console.log('No session found or session check failed');
      }
    } catch (error) {
      console.error('Error checking session:', error);
@@ -83,8 +87,10 @@ const Navbar = () => {
      if (response.ok) {
        setUser(null);
        showSuccess("Berhasil!", "Anda telah keluar dari sistem");
-        // Redirect to root page after successful logout
-        router.push('/');
+        // Redirect to root page after successful logout - using window.location for hard redirect
+        setTimeout(() => {
+          window.location.href = '/';
+        }, 500); // Small delay to show toast notification
      }
    } catch (error) {
      console.error('Logout error:', error);
Author	SHA1	Message	Date
Randa Firman Putra	5a96adfc30	intial commit	2026-03-05 01:16:55 +07:00
Randa Firman Putra	5a0be32d2a	ayo coba	2026-02-28 00:53:22 +07:00
Randa Firman Putra	211fd9c955	ayo commit lagi	2026-02-22 00:21:37 +07:00
Randa Firman Putra	3797daa557	revisi ini	2026-02-04 02:09:05 +07:00
Randa Firman Putra	1e30a9ccfc	always try	2025-12-17 19:48:45 +07:00
Randa Firman Putra	5e2d0a92de	change chart terancam do rules	2025-12-14 20:25:04 +07:00
Randa Firman Putra	e2076ba580	change design login page	2025-12-08 17:57:52 +07:00
Randa Firman Putra	781a7c1be3	logout secure	2025-12-08 02:01:25 +07:00
Randa Firman Putra	7a181be69b	change route.ts	2025-12-08 01:52:50 +07:00
Randa Firman Putra	92edad08d9	debugging	2025-12-08 01:35:19 +07:00