git add .
git commit "implement user management with search sort permissions and safe delete"
This commit is contained in:
@@ -3,9 +3,53 @@
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Admin\User\ChangePasswordRequest;
|
||||
use App\Http\Requests\Admin\User\UserUpdateRequest;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
//
|
||||
public function index()
|
||||
{
|
||||
$users = User::query()
|
||||
->applySearch()
|
||||
->applySort()
|
||||
->latest()
|
||||
->paginate(4)
|
||||
->withQueryString();
|
||||
|
||||
return view('admin.users.index',compact('users'));
|
||||
}
|
||||
|
||||
public function edit(User $user)
|
||||
{
|
||||
return view('admin.users.edit',compact('user'));
|
||||
}
|
||||
public function update(UserUpdateRequest $request,User $user)
|
||||
{
|
||||
$user->update($request->validated());
|
||||
return redirect()->route('admin.users.index');
|
||||
}
|
||||
|
||||
public function destroy(User $user)
|
||||
{
|
||||
$user->comments()->delete();
|
||||
$user->favorites()->delete();
|
||||
$user->reservations()->delete();
|
||||
$user->delete();
|
||||
|
||||
return redirect()->route('admin.users.index')
|
||||
->with('کاربر با موفقیت حذف شده.');
|
||||
}
|
||||
|
||||
public function ChangePassword(ChangePasswordRequest $request,User $user)
|
||||
{
|
||||
$user->update(['password'=>Hash::make($request->password)]);
|
||||
|
||||
return back();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Admin\User;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class ChangePasswordRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, ValidationRule|array<mixed>|string>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'password' => [
|
||||
'required',
|
||||
'min:8',
|
||||
'confirmed',
|
||||
],
|
||||
|
||||
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Admin\User;
|
||||
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class UserUpdateRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*/
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, ValidationRule|array<mixed>|string>
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'first_name'=>[
|
||||
'required',
|
||||
'string'
|
||||
],
|
||||
'last_name'=>[
|
||||
'required',
|
||||
'string'
|
||||
],
|
||||
'email'=>[
|
||||
'required',
|
||||
'email',
|
||||
Rule::unique('users','email')
|
||||
->ignore($this->user->id),
|
||||
],
|
||||
'mobile'=>[
|
||||
'required',
|
||||
|
||||
Rule::unique('users','mobile')
|
||||
->ignore($this->user->id),
|
||||
]
|
||||
];
|
||||
}
|
||||
}
|
||||
+10
-1
@@ -90,8 +90,17 @@ class Admin extends User
|
||||
$query->orderBy('created_at', 'desc'),
|
||||
|
||||
};
|
||||
} public function roles()
|
||||
}
|
||||
public function roles()
|
||||
{
|
||||
return $this->belongsToMany(Role::class, 'admin_roles');
|
||||
}
|
||||
public function hasPermission($permission)
|
||||
{
|
||||
return $this->roles()
|
||||
->whereHas('permissions', function ($query) use ($permission) {
|
||||
$query->where('slug', $permission);
|
||||
})
|
||||
->exists();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Attributes\Scope;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
|
||||
@@ -70,7 +72,43 @@ class User extends Authenticatable
|
||||
'city_id',
|
||||
'status'
|
||||
];
|
||||
#[Scope]
|
||||
protected function applySearch(Builder $query): void
|
||||
{
|
||||
$request = request();
|
||||
|
||||
if ($request->filled('keyword')) {
|
||||
$keyword = $request->input('keyword');
|
||||
|
||||
$query->whereAny([
|
||||
'first_name',
|
||||
'last_name',
|
||||
'mobile',
|
||||
'username',
|
||||
], 'LIKE', "%$keyword%");
|
||||
}
|
||||
}
|
||||
|
||||
#[Scope]
|
||||
protected function applySort(Builder $query): void
|
||||
{
|
||||
$sort = request('sort');
|
||||
|
||||
match ($sort) {
|
||||
|
||||
'first_name_asc' =>
|
||||
$query->orderBy('first_name', 'asc'),
|
||||
|
||||
'first_name_desc' =>
|
||||
$query->orderBy('first_name', 'desc'),
|
||||
|
||||
'newest' =>
|
||||
$query->orderBy('created_at', 'desc'),
|
||||
|
||||
default =>
|
||||
$query->orderBy('created_at', 'desc'),
|
||||
};
|
||||
}
|
||||
public function city()
|
||||
{
|
||||
return $this->belongsTo(City::class);
|
||||
@@ -89,4 +127,8 @@ class User extends Authenticatable
|
||||
{
|
||||
return $this->hasMany(Favorite::class);
|
||||
}
|
||||
public function reservations()
|
||||
{
|
||||
return $this->hasMany(Reservation::class);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,6 +39,14 @@
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item mb-2">
|
||||
<a href="{{ route('admin.users.index') }}"
|
||||
class="nav-link text-white"
|
||||
>
|
||||
لیست کاربران
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item mb-2">
|
||||
|
||||
<a href="{{ route('admin.tours.index') }}"
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
<div>
|
||||
<!-- Live as if you were to die tomorrow. Learn as if you were to live forever. - Mahatma Gandhi -->
|
||||
</div>
|
||||
@@ -1,3 +1,157 @@
|
||||
<div>
|
||||
<!-- Let all your things have their places; let each part of your business have its time. - Benjamin Franklin -->
|
||||
@extends('admin.layouts.app')
|
||||
|
||||
|
||||
@section('breadcrumb')
|
||||
|
||||
<span>
|
||||
ویرایش کاربر
|
||||
</span>
|
||||
|
||||
@endsection
|
||||
|
||||
|
||||
|
||||
@section('content')
|
||||
|
||||
|
||||
<div class="container mt-4">
|
||||
|
||||
|
||||
<div class="card shadow">
|
||||
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
|
||||
<form method="POST"
|
||||
action="{{ route('admin.users.update',$user->id) }}">
|
||||
|
||||
|
||||
@csrf
|
||||
@method('PUT')
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
||||
<div class="col-md-6 mb-3">
|
||||
|
||||
<label>
|
||||
نام
|
||||
</label>
|
||||
|
||||
<input
|
||||
class="form-control"
|
||||
name="first_name"
|
||||
value="{{ old('first_name',$user->first_name) }}">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-md-6 mb-3">
|
||||
|
||||
<label>
|
||||
نام خانوادگی
|
||||
</label>
|
||||
|
||||
<input
|
||||
class="form-control"
|
||||
name="last_name"
|
||||
value="{{ old('last_name',$user->last_name) }}">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-md-6 mb-3">
|
||||
|
||||
<label>
|
||||
ایمیل
|
||||
</label>
|
||||
|
||||
<input
|
||||
class="form-control"
|
||||
name="email"
|
||||
value="{{ old('email',$user->email) }}">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-md-6 mb-3">
|
||||
|
||||
<label>
|
||||
موبایل
|
||||
</label>
|
||||
|
||||
<input
|
||||
class="form-control"
|
||||
name="mobile"
|
||||
value="{{ old('mobile',$user->mobile) }}">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<button class="btn btn-success">
|
||||
ذخیره
|
||||
</button>
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
|
||||
<h5>
|
||||
تغییر رمز عبور
|
||||
</h5>
|
||||
|
||||
|
||||
<form method="POST"
|
||||
action="{{ route('admin.users.ChangePassword',$user->id) }}">
|
||||
|
||||
|
||||
@csrf
|
||||
@method('PUT')
|
||||
|
||||
|
||||
<input
|
||||
type="password"
|
||||
name="password"
|
||||
class="form-control mb-2"
|
||||
placeholder="رمز جدید">
|
||||
|
||||
|
||||
<input
|
||||
type="password"
|
||||
name="password_confirmation"
|
||||
class="form-control mb-2"
|
||||
placeholder="تکرار رمز">
|
||||
|
||||
|
||||
<button class="btn btn-primary">
|
||||
تغییر رمز
|
||||
</button>
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@endsection
|
||||
|
||||
@@ -1,3 +1,214 @@
|
||||
<div>
|
||||
<!-- Simplicity is the essence of happiness. - Cedric Bledsoe -->
|
||||
@extends('admin.layouts.app')
|
||||
|
||||
@section('breadcrumb')
|
||||
<span>
|
||||
مدیریت کاربران
|
||||
</span>
|
||||
@endsection
|
||||
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="container mt-4">
|
||||
|
||||
|
||||
<div class="card shadow-sm mb-3">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<form method="GET"
|
||||
action="{{ route('admin.users.index') }}">
|
||||
|
||||
<div class="row g-2">
|
||||
|
||||
<div class="col-md-8">
|
||||
|
||||
<input
|
||||
type="text"
|
||||
name="keyword"
|
||||
value="{{ request('keyword') }}"
|
||||
class="form-control"
|
||||
placeholder="جستجو نام، ایمیل، موبایل..."
|
||||
>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
|
||||
<select
|
||||
class="form-control"
|
||||
name="sort"
|
||||
onchange="this.form.submit()"
|
||||
>
|
||||
|
||||
<option value="">
|
||||
مرتبسازی بر اساس
|
||||
</option>
|
||||
|
||||
|
||||
<option value="first_name_asc"
|
||||
{{ request('sort') == 'first_name_asc' ? 'selected' : '' }}>
|
||||
نام (الف - ی)
|
||||
</option>
|
||||
|
||||
|
||||
<option value="first_name_desc"
|
||||
{{ request('sort') == 'first_name_desc' ? 'selected' : '' }}>
|
||||
نام (ی - الف)
|
||||
</option>
|
||||
|
||||
|
||||
<option value="newest"
|
||||
{{ request('sort') == 'newest' ? 'selected' : '' }}>
|
||||
جدیدترین
|
||||
</option>
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-2">
|
||||
|
||||
<button class="btn btn-primary w-100">
|
||||
جستجو
|
||||
</button>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@if(request('keyword'))
|
||||
|
||||
<div class="col-md-2">
|
||||
|
||||
<a href="{{ route('admin.users.index') }}"
|
||||
class="btn btn-secondary w-100">
|
||||
پاک کردن
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
@endif
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card shadow">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
|
||||
<table class="table table-bordered text-center align-middle">
|
||||
|
||||
|
||||
<thead class="table-light">
|
||||
|
||||
<tr>
|
||||
<th>شناسه</th>
|
||||
<th>نام</th>
|
||||
<th>نام خانوادگی</th>
|
||||
<th>ایمیل</th>
|
||||
<th>موبایل</th>
|
||||
<th>عملیات</th>
|
||||
</tr>
|
||||
|
||||
</thead>
|
||||
|
||||
|
||||
<tbody>
|
||||
|
||||
|
||||
@forelse($users as $user)
|
||||
|
||||
<tr>
|
||||
|
||||
<td>
|
||||
{{ $user->id }}
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
{{ $user->first_name }}
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
{{ $user->last_name }}
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
{{ $user->email }}
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
{{ $user->mobile }}
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
|
||||
|
||||
<a href="{{ route('admin.users.edit',$user->id) }}"
|
||||
class="btn btn-sm btn-warning">
|
||||
ویرایش
|
||||
</a>
|
||||
|
||||
|
||||
<form action="{{ route('admin.users.destroy',$user->id) }}"
|
||||
method="POST"
|
||||
class="d-inline">
|
||||
|
||||
@csrf
|
||||
@method('DELETE')
|
||||
|
||||
<button class="btn btn-sm btn-danger"
|
||||
onclick="return confirm('حذف شود؟')">
|
||||
حذف
|
||||
</button>
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
@empty
|
||||
|
||||
<tr>
|
||||
|
||||
<td colspan="6">
|
||||
کاربری یافت نشد
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
@endforelse
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
{{ $users->links() }}
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@endsection
|
||||
|
||||
+3
-5
@@ -55,10 +55,7 @@ Route::prefix('admin')->name('admin.')->group(function (){
|
||||
});
|
||||
});
|
||||
|
||||
Route::prefix('users')
|
||||
->name('users.')
|
||||
->controller(UserController::class)
|
||||
->group(function (){
|
||||
Route::prefix('users')->name('users.')->controller(UserController::class)->group(function (){
|
||||
|
||||
Route::get('/','index')->name('index');
|
||||
|
||||
@@ -67,11 +64,12 @@ Route::prefix('admin')->name('admin.')->group(function (){
|
||||
Route::get('show','show')->name('show');
|
||||
|
||||
Route::get('edit','edit')->name('edit');
|
||||
|
||||
Route::put('update','update')->name('update');
|
||||
|
||||
Route::delete('destroy','destroy')->name('destroy');
|
||||
|
||||
Route::put('ChangePassword','ChangePassword')->name('ChangePassword');
|
||||
|
||||
});
|
||||
});
|
||||
Route::prefix('admins')->name('admins.')->controller(AdminController::class)->group(function (){
|
||||
|
||||
Reference in New Issue
Block a user