Feat: CRUD пользователей

 UserController (resource controller)
 UserPolicy
 Маршруты: /admin/users (resource)
 Blade-шаблоны:
  - admin/users/index.blade.php (с фильтрами)
  - admin/users/create.blade.php
  - admin/users/edit.blade.php (с группами)
  - admin/users/show.blade.php
 Ссылка в сайдбаре
 Привязка к организациям
 Распределение по группам
 Управление ролями

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad 2026-03-26 10:29:24 +08:00
parent 2561807e3b
commit 3bec82a991
10 changed files with 571 additions and 1 deletions

0
app/Http/Controllers/Admin/GroupController.php Normal file → Executable file
View File

View File

@ -0,0 +1,166 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\Group;
use App\Models\Organization;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Hash;
use Spatie\Permission\Models\Role;
class UserController extends Controller
{
public function __construct()
{
$this->middleware('auth');
}
public function index(Request $request)
{
Gate::authorize('viewAny', User::class);
$query = User::with(['organization', 'roles']);
// Фильтры
if ($request->filled('organization_id')) {
$query->where('organization_id', $request->organization_id);
}
if ($request->filled('role')) {
$query->role($request->role);
}
if ($request->filled('search')) {
$query->where(function($q) use ($request) {
$q->where('name', 'like', '%' . $request->search . '%')
->orWhere('email', 'like', '%' . $request->search . '%');
});
}
$users = $query->orderBy('created_at', 'desc')->paginate(20);
$organizations = Organization::pluck('name', 'id');
$roles = Role::pluck('name', 'name');
return view('admin.users.index', compact('users', 'organizations', 'roles'));
}
public function create()
{
Gate::authorize('create', User::class);
$organizations = Organization::pluck('name', 'id');
$roles = Role::pluck('name', 'name');
return view('admin.users.create', compact('organizations', 'roles'));
}
public function store(Request $request)
{
Gate::authorize('create', User::class);
$validated = $request->validate([
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:8|confirmed',
'phone' => 'nullable|string|max:20',
'organization_id' => 'nullable|exists:organizations,id',
'role' => 'required|exists:roles,name',
'is_active' => 'boolean',
]);
$user = User::create([
'name' => $validated['name'],
'email' => $validated['email'],
'password' => Hash::make($validated['password']),
'phone' => $validated['phone'] ?? null,
'organization_id' => $validated['organization_id'] ?? null,
'is_active' => $validated['is_active'] ?? true,
]);
$user->assignRole($validated['role']);
return redirect()->route('admin.users.index')
->with('success', 'Пользователь успешно создан.');
}
public function show(User $user)
{
Gate::authorize('view', $user);
$user->load(['organization', 'roles', 'groups']);
return view('admin.users.show', compact('user'));
}
public function edit(User $user)
{
Gate::authorize('update', $user);
$organizations = Organization::pluck('name', 'id');
$roles = Role::pluck('name', 'name');
$userGroups = $user->groups->pluck('id')->toArray();
$allGroups = $user->organization ? $user->organization->groups : collect();
return view('admin.users.edit', compact('user', 'organizations', 'roles', 'userGroups', 'allGroups'));
}
public function update(Request $request, User $user)
{
Gate::authorize('update', $user);
$validated = $request->validate([
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users,email,' . $user->id,
'password' => 'nullable|string|min:8|confirmed',
'phone' => 'nullable|string|max:20',
'organization_id' => 'nullable|exists:organizations,id',
'role' => 'required|exists:roles,name',
'groups' => 'array|exists:groups,id',
'is_active' => 'boolean',
]);
$user->update([
'name' => $validated['name'],
'email' => $validated['email'],
'phone' => $validated['phone'] ?? null,
'organization_id' => $validated['organization_id'] ?? null,
'is_active' => $validated['is_active'] ?? true,
]);
// Обновление пароля
if (!empty($validated['password'])) {
$user->password = Hash::make($validated['password']);
$user->save();
}
// Обновление роли
$user->syncRoles([$validated['role']]);
// Обновление групп
if (isset($validated['groups'])) {
$user->groups()->sync($validated['groups']);
} else {
$user->groups()->detach();
}
return redirect()->route('admin.users.show', $user)
->with('success', 'Пользователь успешно обновлён.');
}
public function destroy(User $user)
{
Gate::authorize('delete', $user);
if ($user->isAdministrator()) {
return back()->with('error', 'Невозможно удалить последнего администратора.');
}
$user->delete();
return redirect()->route('admin.users.index')
->with('success', 'Пользователь успешно удалён.');
}
}

64
app/Policies/UserPolicy.php Executable file
View File

@ -0,0 +1,64 @@
<?php
namespace App\Policies;
use App\Models\User;
class UserPolicy
{
/**
* Determine whether the user can view any models.
*/
public function viewAny(User $user): bool
{
return $user->hasRole(['Administrator', 'Manager']);
}
/**
* Determine whether the user can view the model.
*/
public function view(User $user, User $model): bool
{
return $user->hasRole(['Administrator', 'Manager', 'Curator']);
}
/**
* Determine whether the user can create models.
*/
public function create(User $user): bool
{
return $user->hasRole(['Administrator', 'Manager', 'Curator']);
}
/**
* Determine whether the user can update the model.
*/
public function update(User $user, User $model): bool
{
return $user->hasRole(['Administrator', 'Manager', 'Curator']);
}
/**
* Determine whether the user can delete the model.
*/
public function delete(User $user, User $model): bool
{
return $user->hasRole(['Administrator']);
}
/**
* Determine whether the user can restore the model.
*/
public function restore(User $user, User $model): bool
{
return $user->hasRole(['Administrator']);
}
/**
* Determine whether the user can permanently delete the model.
*/
public function forceDelete(User $user, User $model): bool
{
return $user->hasRole(['Administrator']);
}
}

View File

@ -4,8 +4,10 @@ namespace App\Providers;
use App\Models\Group;
use App\Models\Organization;
use App\Models\User;
use App\Policies\GroupPolicy;
use App\Policies\OrganizationPolicy;
use App\Policies\UserPolicy;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider
@ -18,6 +20,7 @@ class AuthServiceProvider extends ServiceProvider
protected $policies = [
Organization::class => OrganizationPolicy::class,
Group::class => GroupPolicy::class,
User::class => UserPolicy::class,
];
/**

View File

@ -0,0 +1,83 @@
@extends('layouts.app')
@section('title', 'Добавить пользователя')
@section('content')
<div class="container-fluid">
<div class="row">
<nav class="col-md-3 col-lg-2 d-md-block sidebar">
<div class="position-sticky pt-3">@include('partials._sidebar')</div>
</nav>
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">Добавить пользователя</h1>
<a href="{{ route('admin.users.index') }}" class="btn btn-secondary btn-sm">Назад</a>
</div>
<form action="{{ route('admin.users.store') }}" method="POST">
@csrf
<div class="row">
<div class="col-md-6">
<div class="card shadow-sm mb-3">
<div class="card-body">
<h5>Основная информация</h5>
<div class="mb-3">
<label class="form-label">Имя *</label>
<input type="text" name="name" class="form-control @error('name') is-invalid @enderror" value="{{ old('name') }}" required>
@error('name')<div class="invalid-feedback">{{ $message }}</div>@enderror
</div>
<div class="mb-3">
<label class="form-label">Email *</label>
<input type="email" name="email" class="form-control @error('email') is-invalid @enderror" value="{{ old('email') }}" required>
@error('email')<div class="invalid-feedback">{{ $message }}</div>@enderror
</div>
<div class="mb-3">
<label class="form-label">Пароль *</label>
<input type="password" name="password" class="form-control @error('password') is-invalid @enderror" required>
@error('password')<div class="invalid-feedback">{{ $message }}</div>@enderror
</div>
<div class="mb-3">
<label class="form-label">Подтверждение пароля *</label>
<input type="password" name="password_confirmation" class="form-control" required>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="card shadow-sm mb-3">
<div class="card-body">
<h5>Настройки</h5>
<div class="mb-3">
<label class="form-label">Организация</label>
<select name="organization_id" class="form-select">
<option value="">Без организации</option>
@foreach($organizations as $id => $name)
<option value="{{ $id }}" {{ old('organization_id') == $id ? 'selected' : '' }}>{{ $name }}</option>
@endforeach
</select>
</div>
<div class="mb-3">
<label class="form-label">Роль *</label>
<select name="role" class="form-select">
@foreach($roles as $role)
<option value="{{ $role }}" {{ old('role') == $role ? 'selected' : '' }}>{{ $role }}</option>
@endforeach
</select>
@error('role')<div class="invalid-feedback d-block">{{ $message }}</div>@enderror
</div>
<div class="mb-3">
<label class="form-label">Телефон</label>
<input type="tel" name="phone" class="form-control" value="{{ old('phone') }}">
</div>
<div class="form-check mb-3">
<input type="checkbox" name="is_active" value="1" class="form-check-input" {{ old('is_active', true) ? 'checked' : '' }}>
<label class="form-check-label">Активен</label>
</div>
</div>
</div>
</div>
</div>
<button type="submit" class="btn btn-primary"><i class="bi bi-check-lg"></i> Создать</button>
<a href="{{ route('admin.users.index') }}" class="btn btn-secondary">Отмена</a>
</form>
</main>
</div>
</div>
@endsection

View File

@ -0,0 +1,88 @@
@extends('layouts.app')
@section('title', 'Редактировать пользователя')
@section('content')
<div class="container-fluid">
<div class="row">
<nav class="col-md-3 col-lg-2 d-md-block sidebar"><div class="position-sticky pt-3">@include('partials._sidebar')</div></nav>
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">Редактировать: {{ $user->name }}</h1>
<a href="{{ route('admin.users.show', $user) }}" class="btn btn-secondary btn-sm">Назад</a>
</div>
<form action="{{ route('admin.users.update', $user) }}" method="POST">
@csrf @method('PUT')
<div class="row">
<div class="col-md-6">
<div class="card shadow-sm mb-3">
<div class="card-body">
<h5>Основная информация</h5>
<div class="mb-3">
<label class="form-label">Имя *</label>
<input type="text" name="name" class="form-control @error('name') is-invalid @enderror" value="{{ old('name', $user->name) }}" required>
@error('name')<div class="invalid-feedback">{{ $message }}</div>@enderror
</div>
<div class="mb-3">
<label class="form-label">Email *</label>
<input type="email" name="email" class="form-control @error('email') is-invalid @enderror" value="{{ old('email', $user->email) }}" required>
@error('email')<div class="invalid-feedback">{{ $message }}</div>@enderror
</div>
<div class="mb-3">
<label class="form-label">Новый пароль</label>
<input type="password" name="password" class="form-control @error('password') is-invalid @enderror">
<small class="text-muted">Оставьте пустым чтобы не менять</small>
@error('password')<div class="invalid-feedback">{{ $message }}</div>@enderror
</div>
<div class="mb-3">
<label class="form-label">Подтверждение</label>
<input type="password" name="password_confirmation" class="form-control">
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="card shadow-sm mb-3">
<div class="card-body">
<h5>Настройки</h5>
<div class="mb-3">
<label class="form-label">Организация</label>
<select name="organization_id" class="form-select">
<option value="">Без организации</option>
@foreach($organizations as $id => $name)
<option value="{{ $id }}" {{ old('organization_id', $user->organization_id) == $id ? 'selected' : '' }}>{{ $name }}</option>
@endforeach
</select>
</div>
<div class="mb-3">
<label class="form-label">Роль *</label>
<select name="role" class="form-select">
@foreach($roles as $role)
<option value="{{ $role }}" {{ old('role', $user->getRoleNames()->first()) == $role ? 'selected' : '' }}>{{ $role }}</option>
@endforeach
</select>
</div>
@if($allGroups->count() > 0)
<div class="mb-3">
<label class="form-label">Группы</label>
@foreach($allGroups as $group)
<div class="form-check">
<input type="checkbox" name="groups[]" value="{{ $group->id }}" class="form-check-input" {{ in_array($group->id, $userGroups) ? 'checked' : '' }}>
<label class="form-check-label">{{ $group->name }}</label>
</div>
@endforeach
</div>
@endif
<div class="form-check mb-3">
<input type="checkbox" name="is_active" value="1" class="form-check-input" {{ old('is_active', $user->is_active) ? 'checked' : '' }}>
<label class="form-check-label">Активен</label>
</div>
</div>
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">Сохранить</button>
<a href="{{ route('admin.users.show', $user) }}" class="btn btn-secondary">Отмена</a>
</form>
</main>
</div>
</div>
@endsection

View File

@ -0,0 +1,113 @@
@extends('layouts.app')
@section('title', 'Пользователи')
@section('content')
<div class="container-fluid">
<div class="row">
<nav class="col-md-3 col-lg-2 d-md-block sidebar collapse">
<div class="position-sticky pt-3">
@include('partials._sidebar')
</div>
</nav>
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">Пользователи</h1>
@can('create', App\Models\User::class)
<a href="{{ route('admin.users.create') }}" class="btn btn-primary btn-sm">
<i class="bi bi-plus-lg"></i> Добавить пользователя
</a>
@endcan
</div>
@if(session('success'))
<div class="alert alert-success">{{ session('success') }}</div>
@endif
<div class="card shadow-sm mb-4">
<div class="card-body">
<form action="{{ route('admin.users.index') }}" method="GET" class="row g-3">
<div class="col-md-3">
<input type="text" name="search" class="form-control" placeholder="Поиск..." value="{{ request('search') }}">
</div>
<div class="col-md-3">
<select name="organization_id" class="form-select">
<option value="">Все организации</option>
@foreach($organizations as $id => $name)
<option value="{{ $id }}" {{ request('organization_id') == $id ? 'selected' : '' }}>{{ $name }}</option>
@endforeach
</select>
</div>
<div class="col-md-3">
<select name="role" class="form-select">
<option value="">Все роли</option>
@foreach($roles as $role)
<option value="{{ $role }}" {{ request('role') == $role ? 'selected' : '' }}>{{ $role }}</option>
@endforeach
</select>
</div>
<div class="col-md-3">
<button type="submit" class="btn btn-primary"><i class="bi bi-search"></i></button>
<a href="{{ route('admin.users.index') }}" class="btn btn-secondary"><i class="bi bi-x-lg"></i></a>
</div>
</form>
</div>
</div>
<div class="card shadow-sm">
<div class="card-body">
<table class="table table-hover">
<thead>
<tr>
<th>ID</th>
<th>Имя</th>
<th>Email</th>
<th>Организация</th>
<th>Роль</th>
<th>Статус</th>
<th>Действия</th>
</tr>
</thead>
<tbody>
@forelse($users as $user)
<tr>
<td>{{ $user->id }}</td>
<td><a href="{{ route('admin.users.show', $user) }}">{{ $user->name }}</a></td>
<td>{{ $user->email }}</td>
<td>{{ $user->organization?->name ?? '—' }}</td>
<td><span class="badge bg-info">{{ $user->getRoleNames()->first() }}</span></td>
<td>
@if($user->is_active)
<span class="badge bg-success">Активен</span>
@else
<span class="badge bg-secondary">Не активен</span>
@endif
</td>
<td>
<div class="btn-group btn-group-sm">
<a href="{{ route('admin.users.show', $user) }}" class="btn btn-outline-primary"><i class="bi bi-eye"></i></a>
@can('update', $user)
<a href="{{ route('admin.users.edit', $user) }}" class="btn btn-outline-warning"><i class="bi bi-pencil"></i></a>
@endcan
@can('delete', $user)
<form action="{{ route('admin.users.destroy', $user) }}" method="POST" class="d-inline" onsubmit="return confirm('Удалить?')">
@csrf @method('DELETE')
<button class="btn btn-outline-danger"><i class="bi bi-trash"></i></button>
</form>
@endcan
</div>
</td>
</tr>
@empty
<tr><td colspan="7" class="text-center text-muted">Пользователей нет</td></tr>
@endforelse
</tbody>
</table>
</div>
</div>
{{ $users->links() }}
</main>
</div>
</div>
@endsection

View File

@ -0,0 +1,51 @@
@extends('layouts.app')
@section('title', $user->name)
@section('content')
<div class="container-fluid">
<div class="row">
<nav class="col-md-3 col-lg-2 d-md-block sidebar"><div class="position-sticky pt-3">@include('partials._sidebar')</div></nav>
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">{{ $user->name }}</h1>
<div>
@can('update', $user)<a href="{{ route('admin.users.edit', $user) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>@endcan
<a href="{{ route('admin.users.index') }}" class="btn btn-secondary btn-sm">Назад</a>
</div>
</div>
<div class="row">
<div class="col-md-6 mb-4">
<div class="card shadow-sm">
<div class="card-header bg-primary text-white"><h5 class="mb-0">Информация</h5></div>
<div class="card-body">
<table class="table table-sm">
<tr><th>Email:</th><td>{{ $user->email }}</td></tr>
<tr><th>Телефон:</th><td>{{ $user->phone ?? '—' }}</td></tr>
<tr><th>Организация:</th><td>{{ $user->organization?->name ?? '—' }}</td></tr>
<tr><th>Роль:</th><td><span class="badge bg-info">{{ $user->getRoleNames()->first() }}</span></td></tr>
<tr><th>Статус:</th><td>@if($user->is_active)<span class="badge bg-success">Активен</span>@else<span class="badge bg-secondary">Не активен</span>@endif</td></tr>
<tr><th>Создан:</th><td>{{ $user->created_at->format('d.m.Y H:i') }}</td></tr>
</table>
</div>
</div>
</div>
<div class="col-md-6 mb-4">
<div class="card shadow-sm">
<div class="card-header bg-success text-white"><h5 class="mb-0">Группы</h5></div>
<div class="card-body">
@if($user->groups->count() > 0)
<ul class="list-group">
@foreach($user->groups as $group)
<li class="list-group-item">{{ $group->name }} <small class="text-muted">({{ $group->organization?->name }})</small></li>
@endforeach
</ul>
@else
<p class="text-muted mb-0">Не состоит в группах</p>
@endif
</div>
</div>
</div>
</div>
</main>
</div>
</div>
@endsection

View File

@ -15,7 +15,7 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">
<a class="nav-link {{ Str::startsWith($currentRoute, 'admin.users') ? 'active' : '' }}" href="{{ route('admin.users.index') }}">
<i class="bi bi-people"></i> Пользователи
</a>
</li>

View File

@ -4,6 +4,7 @@ use App\Http\Controllers\Auth\LoginController;
use App\Http\Controllers\Auth\RegisterController;
use App\Http\Controllers\Admin\OrganizationController;
use App\Http\Controllers\Admin\GroupController;
use App\Http\Controllers\Admin\UserController;
use App\Http\Controllers\DashboardController;
use Illuminate\Support\Facades\Route;
@ -36,5 +37,6 @@ Route::middleware('auth')->group(function () {
Route::prefix('admin')->name('admin.')->group(function () {
Route::resource('organizations', OrganizationController::class);
Route::resource('organizations.groups', GroupController::class);
Route::resource('users', UserController::class);
});
});