diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index fdbf565..089cc2c 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -100,7 +100,9 @@ public function sendOtp(Request $request) // Simpan email ke session untuk prefill form login session(['email' => $user->email]); - return back()->with('otp_sent', 'OTP berhasil dikirim!'); + return back() + ->with('otp_sent', 'OTP berhasil dikirim!') + ->with('need_otp', true); // ← tambahkan ini } @@ -108,82 +110,116 @@ public function sendOtp(Request $request) // Dipanggil dari form Langkah 2 di halaman login public function loginOtp(Request $request) { + \Log::info('=== LOGIN OTP CALLED - AuthController ==='); $request->validate([ 'email' => 'required|email', 'password' => 'required', 'otp' => 'nullable|digits:6', ]); - // ✅ FIX: tambah with('guru') agar relasi ter-load - $user = User::with('guru')->where('email', $request->email)->first(); + $user = User::with(['guru', 'siswa'])->where('email', $request->email)->first(); if (!$user) { return back()->with('error', 'Email tidak ditemukan.'); } - // Cek password if (!Hash::check($request->password, $user->password)) { return back()->with('error', 'Password salah.'); } - // ================================================= - // ADMIN → LANGSUNG LOGIN TANPA OTP - // ================================================= + // ADMIN → langsung login tanpa OTP if ($user->role === 'admin') { - Auth::login($user); $request->session()->regenerate(); - return redirect()->route('admin.dashboard'); } - // ================================================= - // GURU / SISWA WAJIB OTP - // ================================================= - if (in_array($user->role, ['guru', 'siswa'])) { + // Cek status nonaktif + if ($user->role === 'guru' && (!$user->guru || $user->guru->status === 'nonaktif')) { + return back()->with('error', 'Akun Anda telah dinonaktifkan.'); + } + if ($user->role === 'siswa' && (!$user->siswa || $user->siswa->status === 'nonaktif')) { + return back()->with('error', 'Akun Anda telah dinonaktifkan.'); + } - // ✅ FIX: cek status nonaktif sebelum proses OTP - if ($user->role === 'guru') { - $user->load('guru'); // reload fresh dari DB - if (!$user->guru || $user->guru->status === 'nonaktif') { - return back()->with('error', 'Akun Anda telah dinonaktifkan. Hubungi administrator.'); - } - } + // ── Cek cookie trusted device (per user per device) ── + $cookieKey = 'trusted_device_' . $user->id; + // SESUDAH +$cookieValue = \Illuminate\Support\Facades\Cookie::get($cookieKey); + $trustedDevices = $user->trusted_devices ?? []; + $isDeviceTrusted = $cookieValue && in_array($cookieValue, $trustedDevices); + +// DEBUG SEMENTARA — hapus setelah fix +\Log::info('COOKIE CHECK', [ + 'cookie_key' => $cookieKey, + 'cookie_value' => $cookieValue, + 'trusted_list' => $trustedDevices, + 'is_trusted' => $isDeviceTrusted, +]); + + // Device BARU → wajib OTP + if (!$isDeviceTrusted) { if (empty($request->otp)) { - return back()->with('error', 'OTP wajib diisi.'); + return back() + ->withInput() + ->with('error', 'Perangkat baru terdeteksi! Silakan minta OTP terlebih dahulu.') + ->with('need_otp', true); } if (!$user->otp) { - return back()->with('error', 'OTP belum diminta.'); + return back()->withInput() + ->with('error', 'OTP belum diminta.') + ->with('need_otp', true); } if ((string)$request->otp !== (string)$user->otp) { - return back()->with('error', 'Kode OTP salah.'); + return back()->withInput() + ->with('error', 'Kode OTP salah.') + ->with('need_otp', true); } if (!$user->otp_expired_at || now()->gt($user->otp_expired_at)) { - return back()->with('error', 'OTP sudah kadaluarsa.'); + return back()->withInput() + ->with('error', 'OTP sudah kadaluarsa.') + ->with('need_otp', true); } - // Login + // Generate token unik untuk device ini + $deviceToken = \Illuminate\Support\Str::random(60); + + // Simpan ke trusted_devices (maks 10) + $trustedDevices[] = $deviceToken; + if (count($trustedDevices) > 10) array_shift($trustedDevices); + + $user->update([ + 'otp' => null, + 'otp_expired_at' => null, + 'trusted_devices' => $trustedDevices, + ]); + Auth::login($user); $request->session()->regenerate(); - // Hapus OTP - $user->update([ - 'otp' => null, - 'otp_expired_at' => null, - ]); + // Simpan cookie selama 365 hari + $cookie = cookie($cookieKey, $deviceToken, 60 * 24 * 365, '/', null, false, true); return match ($user->role) { - 'guru' => redirect()->route('guru.dashboard'), - 'siswa' => redirect()->route('siswa.dashboard'), - default => redirect('/'), + 'guru' => redirect()->route('guru.dashboard')->withCookie($cookie), + 'siswa' => redirect()->route('siswa.dashboard')->withCookie($cookie), + default => redirect('/')->withCookie($cookie), }; } - return back()->with('error', 'Role tidak dikenali.'); + // Device LAMA → langsung login + Auth::login($user); + $request->session()->regenerate(); + + return match ($user->role) { + 'guru' => redirect()->route('guru.dashboard'), + 'siswa' => redirect()->route('siswa.dashboard'), + default => redirect('/'), + }; } diff --git a/app/Http/Controllers/admin/GuruController.php b/app/Http/Controllers/admin/GuruController.php index 598bd92..b7d0c65 100644 --- a/app/Http/Controllers/admin/GuruController.php +++ b/app/Http/Controllers/admin/GuruController.php @@ -33,6 +33,15 @@ public function create() // ================= STORE ================= public function store(Request $request) { + if ($request->has('telepon')) { + $telepon = $request->telepon; + $telepon = ltrim($telepon, '+'); + if (strpos($telepon, '62') === 0) { + $telepon = '0' . substr($telepon, 2); + } + $request->merge(['telepon' => $telepon]); + } + $request->validate([ 'nama' => 'required', 'nip' => 'required|unique:gurus,nip', @@ -42,7 +51,7 @@ public function store(Request $request) 'email' => 'required|email|unique:users,email' ]); - // 🔥 CEK JIKA SUDAH ADA (ANTI DOUBLE INSERT) + // 🔥 CEK JIKA SUDAH ADA (ANTI DOUBLE INSERT) if (Guru::where('nip', $request->nip)->exists()) { return back()->withErrors(['nip' => 'NIP sudah ada'])->withInput(); } @@ -83,6 +92,15 @@ public function edit($id) // ================= UPDATE ================= public function update(Request $request, Guru $guru) { + if ($request->has('telepon')) { + $telepon = $request->telepon; + $telepon = ltrim($telepon, '+'); + if (strpos($telepon, '62') === 0) { + $telepon = '0' . substr($telepon, 2); + } + $request->merge(['telepon' => $telepon]); + } + $request->validate([ 'nama' => 'required', 'nip' => 'required|unique:gurus,nip,' . $guru->id, @@ -94,18 +112,18 @@ public function update(Request $request, Guru $guru) $guru->update([ 'nama' => $request->nama, 'nip' => $request->nip, - 'mapel_id' => $request->mapel_id, // 🔥 INI WAJIB + 'mapel_id' => $request->mapel_id, // 🔥 INI WAJIB 'alamat' => $request->alamat, 'telepon' => $request->telepon, ]); - // 🔥 UPDATE USER (TELEPON JUGA UPDATE) + // 🔥 UPDATE USER (TELEPON JUGA UPDATE) $user = User::where('guru_id', $guru->id)->first(); if ($user) { $user->update([ 'name' => $request->nama, 'mapel_id' => $request->mapel_id, - 'telepon' => $request->telepon // ✅ WAJIB ADA + 'telepon' => $request->telepon // ✅ WAJIB ADA ]); } diff --git a/app/Http/Controllers/admin/JadwalController.php b/app/Http/Controllers/admin/JadwalController.php index d0148dd..f7b0726 100644 --- a/app/Http/Controllers/admin/JadwalController.php +++ b/app/Http/Controllers/admin/JadwalController.php @@ -54,6 +54,11 @@ public function store(Request $request) 'jam_selesai' => 'required', ]); + // ✅ Validasi jam selesai harus lebih besar dari jam mulai + if ($request->jam_selesai <= $request->jam_mulai) { + return back()->withInput()->with('error', 'Jam selesai harus lebih besar dari jam mulai!'); + } + // 🔥 CEK BENTROK KELAS $cekKelas = Jadwal::where('kelas_id', $request->kelas_id) ->where('hari', $request->hari) @@ -120,6 +125,11 @@ public function update(Request $request, $id) 'jam_selesai' => 'required', ]); + // ✅ Validasi jam selesai harus lebih besar dari jam mulai + if ($request->jam_selesai <= $request->jam_mulai) { + return back()->withInput()->with('error', 'Jam selesai harus lebih besar dari jam mulai!'); + } + $jadwal->update([ 'kelas_id' => $request->kelas_id, 'mata_pelajaran_id' => $request->mata_pelajaran_id, diff --git a/app/Http/Controllers/admin/ProfileController.php b/app/Http/Controllers/admin/ProfileController.php index aa5d739..0e9689c 100644 --- a/app/Http/Controllers/admin/ProfileController.php +++ b/app/Http/Controllers/admin/ProfileController.php @@ -13,29 +13,50 @@ public function index() return view('admin.profile.index'); } - public function update(Request $request) - { - $user = Auth::user(); + public function update(Request $request) +{ + $user = Auth::user(); - $request->validate([ - 'name' => 'required', - 'photo' => 'nullable|image|mimes:jpg,jpeg,png|max:2048' - ]); + $rules = [ + 'name' => 'required', + 'photo' => 'nullable|image|mimes:jpg,jpeg,png,webp|max:2048', + ]; - // update nama - $user->name = $request->name; + // Tambahan validasi khusus siswa + if ($user->role == 'siswa') { + $rules['nama_ortu'] = 'required'; + $rules['alamat'] = 'required'; + $rules['telepon'] = 'required'; + } - // upload foto - if ($request->hasFile('photo')) { - $file = $request->file('photo'); - $filename = time() . '.' . $file->getClientOriginalExtension(); - $file->move(public_path('uploads'), $filename); + $request->validate($rules); - $user->photo = $filename; + // Update foto + if ($request->hasFile('photo')) { + $file = $request->file('photo'); + $namaFile = time() . '.' . $file->extension(); + $file->move(public_path('uploads'), $namaFile); + $user->photo = $namaFile; + } + + $user->name = $request->name; + $user->save(); + + // Update tabel siswa jika role siswa + if ($user->role == 'siswa' && $user->siswa) { + $telepon = ltrim($request->telepon, '+'); + if (strpos($telepon, '62') === 0) { + $telepon = '0' . substr($telepon, 2); } - $user->save(); - - return back()->with('success', 'Profil berhasil diupdate'); + $user->siswa->update([ + 'nama' => $request->name, + 'nama_ortu' => $request->nama_ortu, + 'alamat' => $request->alamat, + 'telepon' => $telepon, + ]); } + + return back()->with('success', 'Profile berhasil diupdate'); +} } \ No newline at end of file diff --git a/app/Http/Controllers/admin/SiswaController.php b/app/Http/Controllers/admin/SiswaController.php index 304c7ec..b91eee0 100644 --- a/app/Http/Controllers/admin/SiswaController.php +++ b/app/Http/Controllers/admin/SiswaController.php @@ -41,6 +41,18 @@ public function store(Request $request) \Log::info('STORE DIPANGGIL'); + if ($request->has('telepon')) { + $telepon = $request->telepon; + // Hapus tanda plus jika ada (+62 -> 62) + $telepon = ltrim($telepon, '+'); + // Jika tipenya string diawali dengan 62, ganti jadi 0 + if (strpos($telepon, '62') === 0) { + $telepon = '0' . substr($telepon, 2); + } + // Masukkan kembali nilai yang sudah rapi ke dalam request + $request->merge(['telepon' => $telepon]); + } + $request->validate([ 'nama' => 'required', 'jenis_kelamin' => 'required', @@ -72,10 +84,10 @@ public function store(Request $request) $user = User::create([ 'name' => $request->nama, 'email' => $request->email, - 'password' => Hash::make('12345678'), // 🔥 default + 'password' => Hash::make('12345678'), // 🔥 default 'role' => 'siswa', // atau guru 'siswa_id' => $siswa->id, - 'is_default_password' => true // 🔥 WAJIB + 'is_default_password' => true // 🔥 WAJIB ]); /** @var \App\Models\User $user */ @@ -95,6 +107,19 @@ public function edit(Siswa $siswa) // ================= UPDATE ================= public function update(Request $request, Siswa $siswa) { + + if ($request->has('telepon')) { + $telepon = $request->telepon; + // Hapus tanda plus jika ada (+62 -> 62) + $telepon = ltrim($telepon, '+'); + // Jika tipenya string diawali dengan 62, ganti jadi 0 + if (strpos($telepon, '62') === 0) { + $telepon = '0' . substr($telepon, 2); + } + // Masukkan kembali nilai yang sudah rapi ke dalam request + $request->merge(['telepon' => $telepon]); + } + $request->validate([ 'nama' => 'required', 'jenis_kelamin' => 'required', diff --git a/app/Http/Controllers/auth/OtpController.php b/app/Http/Controllers/auth/OtpController.php index 7560611..5c47f50 100644 --- a/app/Http/Controllers/auth/OtpController.php +++ b/app/Http/Controllers/auth/OtpController.php @@ -11,6 +11,7 @@ class OtpController extends Controller // ================= KIRIM OTP ================= public function sendOtp(Request $request) { + \Log::info('=== LOGIN OTP CALLED - OtpController ==='); $method = $request->input('method', 'email'); if ($method === 'email') { @@ -65,73 +66,124 @@ public function sendOtp(Request $request) // ================= LOGIN DENGAN OTP ================= public function loginOtp(Request $request) - { - $request->validate([ - 'email' => 'required|email', - 'password' => 'required', - 'otp' => 'nullable|digits:6', +{ + \Log::info('=== LOGIN OTP CALLED - OtpController ==='); + + $request->validate([ + 'email' => 'required|email', + 'password' => 'required', + 'otp' => 'nullable|digits:6', + ]); + + $user = User::with(['guru', 'siswa'])->where('email', $request->email)->first(); + + if (!$user) { + return back()->with('error', 'Email tidak ditemukan.'); + } + + if (!\Hash::check($request->password, $user->password)) { + return back()->with('error', 'Password salah.'); + } + + // ADMIN → langsung login tanpa OTP + if ($user->role === 'admin') { + \Auth::login($user); + $request->session()->regenerate(); + return redirect()->route('admin.dashboard'); + } + + // Cek status nonaktif + if ($user->role === 'guru' && (!$user->guru || $user->guru->status === 'nonaktif')) { + return back()->with('error', 'Akun Anda telah dinonaktifkan.'); + } + if ($user->role === 'siswa' && (!$user->siswa || $user->siswa->status === 'nonaktif')) { + return back()->with('error', 'Akun Anda telah dinonaktifkan.'); + } + + // ── Cek cookie trusted device ── + $cookieKey = 'trusted_device_' . $user->id; + $cookieValue = $request->cookie($cookieKey); + $trustedDevices = $user->trusted_devices ?? []; + $isDeviceTrusted = $cookieValue && in_array($cookieValue, $trustedDevices); + + \Log::info('=== DEVICE CHECK ===', [ + 'user_id' => $user->id, + 'cookie_key' => $cookieKey, + 'cookie_value' => $cookieValue, + 'trusted_list' => $trustedDevices, + 'is_trusted' => $isDeviceTrusted, + 'all_cookies' => array_keys($request->cookies->all()), + ]); + + // Device BARU → wajib OTP + if (!$isDeviceTrusted) { + + if (empty($request->otp)) { + return back() + ->withInput() + ->with('error', 'Perangkat baru terdeteksi! Silakan minta OTP terlebih dahulu.') + ->with('need_otp', true); + } + + if (!$user->otp) { + return back()->withInput() + ->with('error', 'OTP belum diminta.') + ->with('need_otp', true); + } + + if ((string)$request->otp !== (string)$user->otp) { + return back()->withInput() + ->with('error', 'Kode OTP salah.') + ->with('need_otp', true); + } + + if (!$user->otp_expired_at || now()->gt($user->otp_expired_at)) { + return back()->withInput() + ->with('error', 'OTP sudah kadaluarsa.') + ->with('need_otp', true); + } + + // Generate token unik untuk device ini + $deviceToken = \Illuminate\Support\Str::random(60); + + // Simpan ke trusted_devices (maks 10) + $trustedDevices[] = $deviceToken; + if (count($trustedDevices) > 10) array_shift($trustedDevices); + + $user->update([ + 'otp' => null, + 'otp_expired_at' => null, + 'trusted_devices' => $trustedDevices, ]); - $user = User::with(['guru', 'siswa'])->where('email', $request->email)->first(); - - if (!$user) { - return back()->with('error', 'User tidak ditemukan'); - } - - if (!\Hash::check($request->password, $user->password)) { - return back()->with('error', 'Password salah'); - } - - // ✅ FIX: cek status nonaktif untuk guru - if ($user->role === 'guru') { - $user->load('guru'); - if (!$user->guru || $user->guru->status === 'nonaktif') { - return back()->with('error', 'Akun Anda telah dinonaktifkan. Hubungi administrator.'); - } - } - - // ✅ FIX BARU: cek status nonaktif untuk siswa - if ($user->role === 'siswa') { - $user->load('siswa'); - if (!$user->siswa || $user->siswa->status === 'nonaktif') { - return back()->with('error', 'Akun Anda telah dinonaktifkan. Hubungi administrator.'); - } - } - - // Guru & Siswa wajib OTP - if (in_array($user->role, ['guru', 'siswa'])) { - - if (!$request->otp) { - return back()->with('error', 'OTP wajib diisi'); - } - - if (!$user->otp) { - return back()->with('error', 'OTP belum diminta'); - } - - if ((string) $request->otp !== (string) $user->otp) { - return back()->with('error', 'OTP salah'); - } - - if (!$user->otp_expired_at || now()->gt($user->otp_expired_at)) { - return back()->with('error', 'OTP sudah kadaluarsa'); - } - } - \Auth::login($user); $request->session()->regenerate(); - if (in_array($user->role, ['guru', 'siswa'])) { - $user->update(['otp' => null, 'otp_expired_at' => null]); - } + // Simpan cookie 365 hari + $cookie = cookie($cookieKey, $deviceToken, 60 * 24 * 365, '/', null, false, true); - session()->forget('email'); + \Log::info('=== DEVICE TRUSTED SAVED ===', [ + 'token' => $deviceToken, + 'cookie_key' => $cookieKey, + ]); return match ($user->role) { - 'admin' => redirect()->route('admin.dashboard'), - 'guru' => redirect()->route('guru.dashboard'), - 'siswa' => redirect()->route('siswa.dashboard'), - default => redirect('/'), + 'guru' => redirect()->route('guru.dashboard')->withCookie($cookie), + 'siswa' => redirect()->route('siswa.dashboard')->withCookie($cookie), + default => redirect('/')->withCookie($cookie), }; } + + // Device LAMA → langsung login + \Log::info('=== DEVICE ALREADY TRUSTED - SKIP OTP ==='); + + \Auth::login($user); + $request->session()->regenerate(); + + return match ($user->role) { + 'guru' => redirect()->route('guru.dashboard'), + 'siswa' => redirect()->route('siswa.dashboard'), + default => redirect('/'), + }; +} } \ No newline at end of file diff --git a/app/Http/Controllers/guru/DashboardController.php b/app/Http/Controllers/guru/DashboardController.php index 883ca24..63f0f76 100644 --- a/app/Http/Controllers/guru/DashboardController.php +++ b/app/Http/Controllers/guru/DashboardController.php @@ -1,6 +1,6 @@ with('success', 'Nilai ' . strtoupper($jenis) . ' berhasil dikirim ke menu nilai!'); } + // ── KIRIM NILAI KE SISWA ───────────────────────────────────────── +public function kirimKeSiswa(Request $request) +{ + $request->validate([ + 'kelas_id' => 'required', + ]); + + $user = auth()->user(); + $mapel_id = $user->mapel_id; + + $nilaiList = Nilai::with('siswa') + ->where('mapel_id', $mapel_id) + ->whereHas('siswa', fn($q) => $q->where('kelas_id', $request->kelas_id)) + ->get(); + + foreach ($nilaiList as $n) { + $n->update(['sudah_kirim' => true]); // ✅ ganti is_published → sudah_kirim + } + + return back()->with('success', 'Nilai berhasil dikirim ke siswa!'); +} + // ── EDIT ───────────────────────────────────────────────────────── public function edit($id) { diff --git a/app/Http/Controllers/guru/TugasController.php b/app/Http/Controllers/guru/TugasController.php index 4084ddc..bb6f7f6 100644 --- a/app/Http/Controllers/guru/TugasController.php +++ b/app/Http/Controllers/guru/TugasController.php @@ -215,4 +215,52 @@ public function nilai(Request $request, $id) return back()->with('success', 'Nilai berhasil disimpan'); } + + public function create() +{ + $guru = auth()->user()->guru; + $kelas = Kelas::all(); + + // Ambil satu mapel pertama yang diajarkan guru ini + $mapel = Jadwal::where('guru_id', $guru->id) + ->join('mata_pelajarans', 'jadwals.mata_pelajaran_id', '=', 'mata_pelajarans.id') + ->select('mata_pelajarans.id', 'mata_pelajarans.nama_mapel') + ->first(); + + return view('guru.tugas.create', compact('kelas', 'guru', 'mapel')); +} + +public function store(Request $request) +{ + $request->validate([ + 'judul' => 'required', + 'kelas_id' => 'required', + 'mapel_id' => 'required', + 'deadline' => 'required', + 'file' => 'nullable|max:10240', + ], [ + 'mapel_id.required' => 'Mata pelajaran belum diset, hubungi admin untuk mengatur jadwal.', + 'file.max' => 'Ukuran file maksimal 10MB.', + ]); + + $guru = auth()->user()->guru; + + $filePath = null; + if ($request->hasFile('file')) { + $filePath = $request->file('file')->store('tugas_file', 'public'); + } + + Tugas::create([ + 'judul' => $request->judul, + 'deskripsi' => $request->deskripsi, + 'kelas_id' => $request->kelas_id, + 'mapel_id' => $request->mapel_id, // ✅ sesuaikan nama kolom + 'guru_id' => $guru->id, + 'deadline' => $request->deadline, + 'file' => $filePath, + ]); + + return redirect()->route('guru.tugas.index') + ->with('success', 'Tugas berhasil dibuat'); +} } \ No newline at end of file diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php new file mode 100644 index 0000000..e5024a1 --- /dev/null +++ b/app/Http/Middleware/EncryptCookies.php @@ -0,0 +1,15 @@ + 'datetime', 'password' => 'hashed', + 'trusted_devices' => 'array', ]; /* @@ -94,7 +96,7 @@ public function mapel() return $this->belongsTo(MataPelajaran::class, 'mapel_id'); } - + /* |-------------------------------------------------------------------------- @@ -104,20 +106,20 @@ public function mapel() // Ambil nomor WA dengan fallback public function getTeleponLengkap() -{ - if ($this->telepon) { - return $this->telepon; - } + { + if ($this->telepon) { + return $this->telepon; + } - if ($this->guru && $this->guru->telepon) { - return $this->guru->telepon; - } + if ($this->guru && $this->guru->telepon) { + return $this->guru->telepon; + } - // 🔥 fallback tambahan (opsional tapi aman) - if ($this->siswa && $this->siswa->telepon) { - return $this->siswa->telepon; - } + // 🔥 fallback tambahan (opsional tapi aman) + if ($this->siswa && $this->siswa->telepon) { + return $this->siswa->telepon; + } - return null; -} + return null; + } } \ No newline at end of file diff --git a/database/migrations/2026_06_16_223908_add_trusted_devices_to_users_table.php b/database/migrations/2026_06_16_223908_add_trusted_devices_to_users_table.php new file mode 100644 index 0000000..219bdbe --- /dev/null +++ b/database/migrations/2026_06_16_223908_add_trusted_devices_to_users_table.php @@ -0,0 +1,28 @@ +json('trusted_devices')->nullable()->after('otp_expired_at'); + }); +} + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('users', function (Blueprint $table) { + // + }); + } +}; diff --git a/public/uploads/1779500210.png b/public/uploads/1779500210.png new file mode 100644 index 0000000..5651522 Binary files /dev/null and b/public/uploads/1779500210.png differ diff --git a/public/uploads/1781061804.png b/public/uploads/1781061804.png new file mode 100644 index 0000000..c773722 Binary files /dev/null and b/public/uploads/1781061804.png differ diff --git a/public/uploads/1781062405.png b/public/uploads/1781062405.png new file mode 100644 index 0000000..5fa8bc0 Binary files /dev/null and b/public/uploads/1781062405.png differ diff --git a/resources/views/admin/jadwal/create.blade.php b/resources/views/admin/jadwal/create.blade.php index c092cff..b691427 100644 --- a/resources/views/admin/jadwal/create.blade.php +++ b/resources/views/admin/jadwal/create.blade.php @@ -150,17 +150,47 @@ - {{-- JAM --}} -
-
- - -
-
- - -
-
+ {{-- JAM --}} +
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/resources/views/admin/jadwal/edit.blade.php b/resources/views/admin/jadwal/edit.blade.php index f50b8ef..d9f1da2 100644 --- a/resources/views/admin/jadwal/edit.blade.php +++ b/resources/views/admin/jadwal/edit.blade.php @@ -171,17 +171,47 @@
- {{-- JAM --}} -
-
- - -
-
- - -
-
+ {{-- JAM --}} +
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/resources/views/admin/profile/index.blade.php b/resources/views/admin/profile/index.blade.php index dd12fc5..449bb27 100644 --- a/resources/views/admin/profile/index.blade.php +++ b/resources/views/admin/profile/index.blade.php @@ -11,8 +11,6 @@ --primary-light: #EEF2FF; --success: #059669; --success-light: #ECFDF5; - --danger: #DC2626; - --neutral-light: #F9FAFB; --bg: #F3F4F8; --surface: #FFFFFF; --border: #E5E7EB; @@ -25,10 +23,11 @@ * { font-family: 'Plus Jakarta Sans', sans-serif; box-sizing: border-box; } +/* ── PAGE ── */ .sw-page { padding: 28px 32px; background: var(--bg); min-height: 100vh; } /* ── TOPBAR ── */ -.sw-topbar { margin-bottom: 28px; } +.sw-topbar { margin-bottom: 24px; } .sw-topbar h3 { font-size: 21px; font-weight: 800; color: var(--text-dark); margin: 0 0 4px; letter-spacing: -.3px; } .sw-topbar p { font-size: 13px; color: var(--text-soft); margin: 0; } @@ -40,7 +39,7 @@ font-size: 13px; color: var(--success); margin-bottom: 24px; font-weight: 500; } -/* ── GRID LAYOUT ── */ +/* ── GRID ── */ .sw-grid { display: grid; grid-template-columns: 300px 1fr; @@ -53,24 +52,15 @@ background: var(--surface); border-radius: var(--radius-lg); border: 1px solid var(--border); - box-shadow: 0 1px 3px rgba(0,0,0,.05); overflow: hidden; } /* ── AVATAR CARD ── */ -.avatar-card { text-align: center; } - .avatar-banner { height: 90px; background: linear-gradient(135deg, #1E3A6E 0%, #4F46E5 60%, #7C3AED 100%); - position: relative; } -.avatar-banner::after { - content: ''; - position: absolute; inset: 0; - background: url("data:image/svg+xml,%3Csvg width='60' height='60' viewBox='0 0 60 60' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cg fill='%23ffffff' fill-opacity='0.04'%3E%3Ccircle cx='30' cy='30' r='20'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); -} - +.avatar-body { padding: 0 24px 28px; text-align: center; } .avatar-wrap { position: relative; display: inline-block; @@ -79,81 +69,70 @@ } .avatar-img { width: 100px; height: 100px; - border-radius: 50%; - object-fit: cover; - border: 4px solid var(--surface); - box-shadow: 0 4px 16px rgba(0,0,0,.12); - display: block; + border-radius: 50%; object-fit: cover; + border: 4px solid var(--surface); display: block; } .avatar-online { position: absolute; bottom: 6px; right: 6px; width: 14px; height: 14px; - background: var(--success); - border: 2px solid var(--surface); - border-radius: 50%; + background: var(--success); border: 2px solid var(--surface); border-radius: 50%; } - -.avatar-body { padding: 0 24px 28px; } -.avatar-name { font-size: 17px; font-weight: 800; color: var(--text-dark); margin-bottom: 4px; } +.avatar-name { font-size: 17px; font-weight: 800; color: var(--text-dark); margin-bottom: 6px; } .avatar-role { display: inline-flex; align-items: center; gap: 5px; background: var(--primary-light); border: 1px solid #C7D2FE; border-radius: 99px; padding: 4px 12px; - font-size: 11.5px; font-weight: 700; color: var(--primary); - margin-bottom: 20px; + font-size: 11.5px; font-weight: 700; color: var(--primary); margin-bottom: 20px; } .avatar-role span { width: 6px; height: 6px; background: var(--primary); border-radius: 50%; } .avatar-stats { - display: flex; gap: 0; - border: 1px solid var(--border); - border-radius: var(--radius-md); - overflow: hidden; -} -.avatar-stat { - flex: 1; padding: 12px 8px; text-align: center; - border-right: 1px solid var(--border); + display: flex; + border: 1px solid var(--border); border-radius: var(--radius-md); overflow: hidden; } +.avatar-stat { flex: 1; padding: 12px 8px; text-align: center; border-right: 1px solid var(--border); } .avatar-stat:last-child { border-right: none; } -.avatar-stat-val { font-size: 16px; font-weight: 800; color: var(--primary); } -.avatar-stat-lbl { font-size: 10.5px; color: var(--text-soft); font-weight: 600; margin-top: 2px; } +.avatar-stat-val { display: flex; justify-content: center; margin-bottom: 4px; } +.avatar-stat-lbl { font-size: 10.5px; color: var(--text-soft); font-weight: 600; } -/* ── FORM CARD ── */ +/* ── INFO LIST (siswa) ── */ +.avatar-info-list { margin-top: 18px; display: flex; flex-direction: column; gap: 10px; text-align: left; } +.avatar-info-item { + display: flex; align-items: flex-start; gap: 10px; + padding: 10px 12px; + background: #F9FAFB; border: 1px solid var(--border); border-radius: var(--radius-md); +} +.avatar-info-item svg { color: var(--primary); flex-shrink: 0; margin-top: 1px; } +.avatar-info-item .lbl { font-size: 10.5px; font-weight: 700; color: var(--text-soft); text-transform: uppercase; letter-spacing: .5px; margin-bottom: 2px; } +.avatar-info-item .val { font-size: 13px; font-weight: 600; color: var(--text-dark); } + +/* ── CARD HEADER ── */ .sw-card-header { display: flex; align-items: center; gap: 12px; - padding: 20px 24px; - border-bottom: 1px solid var(--border); - background: linear-gradient(135deg, #F5F3FF 0%, #EEF2FF 100%); + padding: 20px 24px; border-bottom: 1px solid var(--border); + background: #F5F3FF; } .sw-card-header-icon { width: 38px; height: 38px; background: var(--primary); border-radius: 10px; display: flex; align-items: center; justify-content: center; color: #fff; flex-shrink: 0; - box-shadow: 0 2px 8px rgba(79,70,229,.3); } .sw-card-header h5 { font-size: 15px; font-weight: 700; color: #3730A3; margin: 0; } .sw-card-header p { font-size: 12.5px; color: #6D6AA4; margin: 2px 0 0; } .sw-card-body { padding: 28px 24px; } -/* ── SECTION ── */ -.sw-section { - display: flex; align-items: center; gap: 10px; - margin: 0 0 20px; -} -.sw-section-label { - font-size: 11.5px; font-weight: 700; color: var(--primary); - text-transform: uppercase; letter-spacing: .8px; white-space: nowrap; -} -.sw-section-line { - flex: 1; height: 1px; - background: linear-gradient(to right, #C7D2FE, transparent); -} +/* ── SECTION DIVIDER ── */ +.sw-section { display: flex; align-items: center; gap: 10px; margin-bottom: 20px; } +.sw-section-label { font-size: 11.5px; font-weight: 700; color: var(--primary); text-transform: uppercase; letter-spacing: .8px; white-space: nowrap; } +.sw-section-line { flex: 1; height: 1px; background: linear-gradient(to right, #C7D2FE, transparent); } -/* ── FORM ELEMENTS ── */ -.sw-form-group { display: flex; flex-direction: column; gap: 6px; margin-bottom: 20px; } -.sw-label { font-size: 12.5px; font-weight: 600; color: var(--text-mid); } +/* ── FORM ── */ +.sw-row { display: grid; grid-template-columns: 1fr 1fr; gap: 16px; } +.sw-form-group { display: flex; flex-direction: column; gap: 6px; margin-bottom: 18px; } +.sw-label { font-size: 12.5px; font-weight: 600; color: var(--text-mid); } +.sw-input-note { font-size: 11px; color: var(--text-soft); } .sw-input-wrap { position: relative; } .sw-input-wrap svg { @@ -161,38 +140,41 @@ transform: translateY(-50%); color: #9CA3AF; pointer-events: none; } .sw-input { - width: 100%; - padding: 11px 14px 11px 42px; - border: 1.5px solid var(--border); - border-radius: var(--radius-md); + width: 100%; padding: 11px 14px 11px 42px; + border: 1.5px solid var(--border); border-radius: var(--radius-md); font-size: 14px; font-family: 'Plus Jakarta Sans', sans-serif; - color: var(--text-dark); background: var(--neutral-light); + color: var(--text-dark); background: #F9FAFB; outline: none; transition: all .15s; } -.sw-input:focus { - border-color: var(--primary); - background: #fff; - box-shadow: 0 0 0 3px rgba(79,70,229,.1); -} +.sw-input:focus { border-color: var(--primary); background: #fff; box-shadow: 0 0 0 3px rgba(79,70,229,.1); } +.sw-input[readonly] { background: #F3F4F8; color: var(--text-soft); cursor: not-allowed; } + +.sw-textarea { + width: 100%; padding: 11px 14px; + border: 1.5px solid var(--border); border-radius: var(--radius-md); + font-size: 14px; font-family: 'Plus Jakarta Sans', sans-serif; + color: var(--text-dark); background: #F9FAFB; + outline: none; resize: vertical; min-height: 80px; transition: all .15s; +} +.sw-textarea:focus { border-color: var(--primary); background: #fff; box-shadow: 0 0 0 3px rgba(79,70,229,.1); } + +/* ── PHOTO ── */ +.sw-photo-preview { + display: flex; align-items: center; gap: 14px; + background: #F9FAFB; border: 1px solid var(--border); + border-radius: var(--radius-md); padding: 14px 16px; margin-bottom: 12px; +} +.sw-photo-preview img { width: 52px; height: 52px; border-radius: 50%; object-fit: cover; border: 2px solid #C7D2FE; } +.sw-photo-preview-info .title { font-size: 13px; font-weight: 700; color: var(--text-dark); } +.sw-photo-preview-info .sub { font-size: 11.5px; color: var(--text-soft); margin-top: 2px; } -/* ── PHOTO UPLOAD ZONE ── */ .sw-upload-zone { - border: 2px dashed var(--border); - border-radius: var(--radius-md); - padding: 24px 20px; - text-align: center; - background: var(--neutral-light); - cursor: pointer; - transition: all .2s; - position: relative; -} -.sw-upload-zone:hover { - border-color: var(--primary); - background: var(--primary-light); -} -.sw-upload-zone input[type="file"] { - position: absolute; inset: 0; opacity: 0; cursor: pointer; width: 100%; height: 100%; + border: 2px dashed var(--border); border-radius: var(--radius-md); + padding: 24px 20px; text-align: center; + background: #F9FAFB; cursor: pointer; transition: all .2s; position: relative; } +.sw-upload-zone:hover { border-color: var(--primary); background: var(--primary-light); } +.sw-upload-zone input[type="file"] { position: absolute; inset: 0; opacity: 0; cursor: pointer; width: 100%; height: 100%; } .sw-upload-icon { width: 44px; height: 44px; background: var(--primary-light); border-radius: 10px; @@ -208,40 +190,24 @@ font-size: 11px; font-weight: 600; color: var(--primary); } -/* current photo preview */ -.sw-photo-preview { - display: flex; align-items: center; gap: 14px; - background: var(--neutral-light); border: 1px solid var(--border); - border-radius: var(--radius-md); padding: 14px 16px; - margin-bottom: 12px; -} -.sw-photo-preview img { - width: 52px; height: 52px; - border-radius: 50%; object-fit: cover; - border: 2px solid var(--primary-light); -} -.sw-photo-preview-info .title { font-size: 13px; font-weight: 700; color: var(--text-dark); } -.sw-photo-preview-info .sub { font-size: 11.5px; color: var(--text-soft); margin-top: 2px; } - /* ── FOOTER ── */ .sw-footer { - display: flex; justify-content: flex-end; align-items: center; + display: flex; justify-content: flex-end; padding-top: 24px; border-top: 1px solid var(--border); margin-top: 8px; } -.sw-btn { +.sw-btn-primary { display: inline-flex; align-items: center; gap: 7px; padding: 11px 22px; border-radius: var(--radius-md); - font-size: 14px; font-weight: 700; border: none; - cursor: pointer; text-decoration: none; - transition: all .18s ease; line-height: 1; - font-family: 'Plus Jakarta Sans', sans-serif; + font-size: 14px; font-weight: 700; border: none; cursor: pointer; + background: var(--primary); color: #fff; + font-family: 'Plus Jakarta Sans', sans-serif; transition: all .18s; } -.sw-btn-primary { background: var(--primary); color: #fff; box-shadow: 0 4px 14px rgba(79,70,229,.3); } -.sw-btn-primary:hover { background: var(--primary-dark); transform: translateY(-1px); box-shadow: 0 6px 20px rgba(79,70,229,.38); } +.sw-btn-primary:hover { background: var(--primary-dark); transform: translateY(-1px); } @media (max-width: 900px) { .sw-grid { grid-template-columns: 1fr; } .sw-page { padding: 16px; } + .sw-row { grid-template-columns: 1fr; } } @@ -263,10 +229,11 @@
- {{-- LEFT: AVATAR CARD --}} -
+ {{-- KIRI: AVATAR CARD --}} +
+
@if(auth()->user()->photo) Foto Profil @@ -278,7 +245,11 @@
{{ auth()->user()->name }}
- Administrator + + @if(auth()->user()->role == 'siswa') Siswa + @elseif(auth()->user()->role == 'guru') Guru + @else Administrator + @endif
@@ -301,11 +272,40 @@
Aktif
+ + {{-- Info ringkas khusus siswa --}} + @if(auth()->user()->role == 'siswa' && auth()->user()->siswa) + @php $siswa = auth()->user()->siswa; @endphp +
+
+ +
NIS
{{ $siswa->nis }}
+
+
+ +
Kelas
{{ $siswa->kelas->nama_kelas ?? '-' }}
+
+
+ +
Orang Tua
{{ $siswa->nama_ortu }}
+
+
+ +
Telepon
{{ $siswa->telepon }}
+
+
+ +
Alamat
{{ $siswa->alamat }}
+
+
+ @endif +
- {{-- RIGHT: FORM CARD --}} + {{-- KANAN: FORM CARD --}}
+
@@ -320,7 +320,7 @@
@csrf - {{-- SECTION: INFO --}} + {{-- Informasi Akun --}}
Informasi Akun
@@ -330,18 +330,68 @@
- +
- {{-- SECTION: FOTO --}} -
+ {{-- Data Diri (khusus siswa) --}} + @if(auth()->user()->role == 'siswa' && auth()->user()->siswa) + @php $siswa = auth()->user()->siswa; @endphp + +
+ Data Diri +
+
+ +
+
+ +
+ + +
+ NIS tidak dapat diubah +
+
+ +
+ + +
+ Ditentukan oleh admin +
+
+ +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+ + @endif + + {{-- Foto Profil --}} +
Foto Profil
- {{-- Current photo preview --}}
@if(auth()->user()->photo) Foto saat ini @@ -354,20 +404,18 @@
- {{-- Upload zone --}}
Klik untuk unggah foto baru
-
atau seret & lepas file ke sini
+
atau seret & lepas file ke sini
Pilih File
- {{-- FOOTER --}}
- @@ -381,7 +429,6 @@
+ {{-- FILTER --}} +
+ + + + + Reset + +
+ + {{-- BULK ACTION + TABLE --}} +
+ @csrf + +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + @forelse($siswa as $item) + + + + + + + + + + + + + + + @empty + + + + @endforelse + +
+ + NoNamaJKNISKelasOrang TuaEmailAlamatTeleponStatusAksi
+ + + {{ $loop->iteration }} + {{ $item->nama }} + @if($item->jenis_kelamin == 'L') + L + @else + P + @endif + + {{ $item->nis }} + + {{ $item->kelas->nama_kelas ?? '-' }} + {{ $item->nama_ortu }}{{ $item->user->email ?? '-' }} + {{ $item->alamat }} + {{ $item->telepon }} + @if($item->status == 'aktif') + + Aktif + + @else + + Nonaktif + + @endif + +
+ + + + + + Edit + + + + @csrf + @method('DELETE') + + + + @if($item->status == 'aktif') +
+ @csrf + + +
+ @else + + + + + Aktifkan + + @endif +
+
+
+
🎓
+

Tidak ada data siswa ditemukan

+
+
+
+
+ + +
+ + @endsection \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index bd6beb8..ea64924 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -562,63 +562,74 @@ LANGKAH 2: Login Field OTP disembunyikan otomatis untuk admin ============================================================ --}} -
- @csrf + {{-- ============================================================ + LANGKAH 2: Login + ============================================================ --}} + + @csrf - {{-- Email --}} -
- - - - - -
+ {{-- Tampilkan OTP jika: device baru ATAU OTP baru dikirim --}} + - {{-- Password --}} -
- - - - - -
+ {{-- Email --}} +
+ + + + + +
- {{-- OTP — disembunyikan untuk admin --}} -
- - - - - -
+ {{-- Password --}} +
+ + + + + +
- {{-- Badge info admin --}} -
- - - - Akun admin tidak memerlukan kode OTP -
+ {{-- OTP — muncul hanya jika device baru --}} + - -
+ {{-- Info device baru --}} + + + {{-- Badge admin --}} +
+ + + + Akun admin tidak memerlukan kode OTP +
+ + + Lupa Password? @@ -639,33 +650,90 @@ // ================================================================ // Toggle tampilan Langkah 1 (OTP section) berdasarkan role // ================================================================ + // Daftar email admin + const ADMIN_EMAILS = [ + 'smanbondowoso1@gmail.com', + // tambah email admin lain di sini + ]; + + function showOtpField(show) { + const otpWrap = document.getElementById('wrap-otp-field'); + const otpInput = document.getElementById('otp-input'); + const banner = document.getElementById('new-device-banner'); + + otpWrap.style.display = show ? 'block' : 'none'; + banner.style.display = show ? 'block' : 'none'; + otpInput.required = show; + if (!show) otpInput.value = ''; + } + function checkAdminEmail(email) { const isAdmin = ADMIN_EMAILS.includes(email.trim().toLowerCase()); + const needOtp = document.getElementById('has-otp-error').value === '1'; - const step1 = document.getElementById('step1-section'); - const adminDiv = document.getElementById('admin-divider'); - const otpWrap = document.getElementById('wrap-otp-field'); - const otpInput = document.getElementById('otp-input'); + const step1 = document.getElementById('step1-section'); + const adminDiv = document.getElementById('admin-divider'); const adminBadge = document.getElementById('admin-info-badge'); if (isAdmin) { - // Sembunyikan Langkah 1 dan field OTP step1.style.display = 'none'; adminDiv.style.display = 'block'; - otpWrap.style.display = 'none'; adminBadge.style.display = 'flex'; - otpInput.required = false; - otpInput.value = ''; + showOtpField(false); } else { - // Tampilkan kembali semua untuk guru/siswa step1.style.display = 'block'; adminDiv.style.display = 'none'; - otpWrap.style.display = 'block'; adminBadge.style.display = 'none'; - otpInput.required = true; + // Tampilkan OTP hanya jika server bilang device baru + showOtpField(needOtp); } } + function selectMethod(method) { + const emailBtn = document.getElementById('btn-email-method'); + const waBtn = document.getElementById('btn-wa-method'); + const emailWrap = document.getElementById('wrap-email-otp'); + const waWrap = document.getElementById('wrap-wa-otp'); + const emailInput = document.getElementById('input-email-otp'); + const waInput = document.getElementById('input-wa-otp'); + const label = document.getElementById('btn-otp-label'); + const methodInput = document.getElementById('otp_method'); + + if (method === 'email') { + emailBtn.classList.add('active'); + waBtn.classList.remove('active'); + emailWrap.style.display = 'block'; + waWrap.style.display = 'none'; + emailInput.required = true; + waInput.required = false; + waInput.value = ''; + label.textContent = 'Dapatkan OTP via Email'; + methodInput.value = 'email'; + } else { + waBtn.classList.add('active'); + emailBtn.classList.remove('active'); + waWrap.style.display = 'block'; + emailWrap.style.display = 'none'; + waInput.required = true; + emailInput.required = false; + emailInput.value = ''; + label.textContent = 'Dapatkan OTP via WhatsApp'; + methodInput.value = 'wa'; + } + } + + document.addEventListener('DOMContentLoaded', function () { + const emailEl = document.getElementById('login-email'); + if (emailEl && emailEl.value.trim() !== '') { + checkAdminEmail(emailEl.value); + } + + // Jika server kirim need_otp, langsung tampilkan kolom OTP + const needOtp = document.getElementById('has-otp-error').value === '1'; + if (needOtp) { + showOtpField(true); + } + }); // ================================================================ // Toggle metode OTP (email / WhatsApp) // ================================================================ diff --git a/resources/views/components/topbar.blade.php b/resources/views/components/topbar.blade.php index 3731762..2b8e8a9 100644 --- a/resources/views/components/topbar.blade.php +++ b/resources/views/components/topbar.blade.php @@ -366,7 +366,7 @@