novy/aplikasi-ketertiban
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Face ID (scan, register, liveness) + role baru KS/Waka/Ketua Tim + notifikasi WA ortu + scoping wali kelas + error pages premium

Browse Source
This commit is contained in:
Novy San87
2026-08-02 20:57:11 +07:00
parent 0a5f471854
commit 6e256661dd
76 changed files with 5335 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/UserController.php
+17 -4
View File
@@ -25,7 +25,11 @@ class UserController extends Controller
}
if ($request->filled('role')) {
$query->where('role', $request->role);
$role = $request->role;
$query->where(function ($q) use ($role) {
$q->where('role', $role)
->orWhereJsonContains('roles', $role);
});
}
$users = $query->orderBy('name')->paginate(20);
@@ -40,10 +44,14 @@ class UserController extends Controller
'username' => ['required', 'string', 'max:255', 'unique:users,username'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email'],
'password' => ['required', 'string', 'min:6'],
'role' => ['required', 'in:admin,bk,wali_kelas,staff,other'],
'roles' => ['required', 'array', 'min:1'],
'roles.*' => ['in:admin,bk,wali_kelas,staff,other,kepala_sekolah,waka_kesiswaan,ketua_tim'],
'is_active' => ['boolean'],
]);
$roles = array_values(array_unique($validated['roles']));
$validated['roles'] = $roles;
$validated['role'] = $roles[0];
$validated['password'] = Hash::make($validated['password']);
$validated['is_active'] = $request->boolean('is_active', true);
@@ -60,10 +68,15 @@ class UserController extends Controller
'username' => ['required', 'string', 'max:255', 'unique:users,username,' . $user->id],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email,' . $user->id],
'password' => ['nullable', 'string', 'min:6'],
'role' => ['required', 'in:admin,bk,wali_kelas,staff,other'],
'roles' => ['required', 'array', 'min:1'],
'roles.*' => ['in:admin,bk,wali_kelas,staff,other,kepala_sekolah,waka_kesiswaan,ketua_tim'],
'is_active' => ['boolean'],
]);
$roles = array_values(array_unique($validated['roles']));
$validated['roles'] = $roles;
$validated['role'] = $roles[0];
if (!empty($validated['password'])) {
$validated['password'] = Hash::make($validated['password']);
} else {
@@ -92,7 +105,7 @@ class UserController extends Controller
public function resetPassword(Request $request, User $user): RedirectResponse
{
if ($user->id === auth()->id() && $user->role === 'admin') {
if ($user->id === auth()->id() && $user->isAdmin()) {
return back()->with('error', 'Ganti password admin lewat profil.');
}