diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 1da19b7..961089e 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -50,7 +50,7 @@ class UserController extends Controller abort(403); } - request()->validate([ + $validData = $request->validate([ 'first_name' => ['required'], 'last_name' => ['required'], 'email' => ['required', 'email'], @@ -58,14 +58,18 @@ class UserController extends Controller 'judging_preference' => ['required'], 'school_id' => ['required', 'exists:schools,id'], ]); + $validData['is_admin'] = $request->get('is_admin') == 'on' ? 1 : 0; + $validData['is_tab'] = $request->get('is_tab') == 'on' ? 1 : 0; $user->update([ - 'first_name' => request('first_name'), - 'last_name' => request('last_name'), - 'email' => request('email'), - 'cell_phone' => request('cell_phone'), - 'judging_preference' => request('judging_preference'), - 'school_id' => request('school_id'), + 'first_name' => $validData['first_name'], + 'last_name' => $validData['last_name'], + 'email' => $validData['email'], + 'cell_phone' => $validData['cell_phone'], + 'judging_preference' => $validData['judging_preference'], + 'school_id' => $validData['school_id'], + 'is_admin' => $validData['is_admin'], + 'is_tab' => $validData['is_tab'], ]); return redirect('/admin/users'); @@ -82,7 +86,7 @@ class UserController extends Controller // Generate a random password $randomPassword = Str::random(12); - $user = \App\Models\User::make([ + $user = User::make([ 'first_name' => request('first_name'), 'last_name' => request('last_name'), 'email' => request('email'), @@ -104,12 +108,13 @@ class UserController extends Controller return redirect('/admin/users'); } - public function destroy(Request $request, User $user) + public function destroy(User $user) { if (! Auth::user()->is_admin) { abort(403); } $user->delete(); + return redirect()->route('admin.users.index')->with('success', 'User deleted successfully'); } } diff --git a/app/Models/User.php b/app/Models/User.php index b1c4697..0cf53b1 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -30,6 +30,8 @@ class User extends Authenticatable implements MustVerifyEmail 'password', 'profile_image_url', 'school_id', + 'is_tab', + 'is_admin', ]; /** @@ -122,33 +124,23 @@ class User extends Authenticatable implements MustVerifyEmail return $this->belongsToMany(BonusScoreDefinition::class, 'bonus_score_judge_assignment'); } - public function advancementVotes(): HasMany - { - return $this->hasMany(JudgeAdvancementVote::class); - } - public function isJudge(): bool { return $this->judgingAssignments()->count() > 0 || $this->bonusJudgingAssignments()->count() > 0; } - /** - * Return an array of schools using the users email domain - * - * @return SchoolEmailDomain[] - */ public function possibleSchools(): Collection { if ($this->school_id) { $return[] = $this->school; - return $return; + return collect($return); } return SchoolEmailDomain::with('school')->where('domain', '=', $this->emailDomain())->get(); } - public function canTab() + public function canTab(): bool { if ($this->is_admin) { return true; diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index c23987c..5ba71e6 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -30,6 +30,17 @@ @endforeach +