From 3bec82a991e28811900f77ae956299e69978fb75 Mon Sep 17 00:00:00 2001 From: mirivlad Date: Thu, 26 Mar 2026 10:29:24 +0800 Subject: [PATCH] =?UTF-8?q?Feat:=20CRUD=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ 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 --- .../Controllers/Admin/GroupController.php | 0 app/Http/Controllers/Admin/UserController.php | 166 ++++++++++++++++++ app/Policies/UserPolicy.php | 64 +++++++ app/Providers/AuthServiceProvider.php | 3 + resources/views/admin/users/create.blade.php | 83 +++++++++ resources/views/admin/users/edit.blade.php | 88 ++++++++++ resources/views/admin/users/index.blade.php | 113 ++++++++++++ resources/views/admin/users/show.blade.php | 51 ++++++ resources/views/partials/_sidebar.blade.php | 2 +- routes/web.php | 2 + 10 files changed, 571 insertions(+), 1 deletion(-) mode change 100644 => 100755 app/Http/Controllers/Admin/GroupController.php create mode 100755 app/Http/Controllers/Admin/UserController.php create mode 100755 app/Policies/UserPolicy.php create mode 100644 resources/views/admin/users/create.blade.php create mode 100644 resources/views/admin/users/edit.blade.php create mode 100644 resources/views/admin/users/index.blade.php create mode 100644 resources/views/admin/users/show.blade.php diff --git a/app/Http/Controllers/Admin/GroupController.php b/app/Http/Controllers/Admin/GroupController.php old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php new file mode 100755 index 0000000..fd376e5 --- /dev/null +++ b/app/Http/Controllers/Admin/UserController.php @@ -0,0 +1,166 @@ +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', 'Пользователь успешно удалён.'); + } +} diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php new file mode 100755 index 0000000..133b905 --- /dev/null +++ b/app/Policies/UserPolicy.php @@ -0,0 +1,64 @@ +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']); + } +} diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index ca04072..f9a79c5 100755 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -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, ]; /** diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php new file mode 100644 index 0000000..95337a9 --- /dev/null +++ b/resources/views/admin/users/create.blade.php @@ -0,0 +1,83 @@ +@extends('layouts.app') +@section('title', 'Добавить пользователя') +@section('content') +
+
+ +
+
+

Добавить пользователя

+ Назад +
+
+ @csrf +
+
+
+
+
Основная информация
+
+ + + @error('name')
{{ $message }}
@enderror +
+
+ + + @error('email')
{{ $message }}
@enderror +
+
+ + + @error('password')
{{ $message }}
@enderror +
+
+ + +
+
+
+
+
+
+
+
Настройки
+
+ + +
+
+ + + @error('role')
{{ $message }}
@enderror +
+
+ + +
+
+ + +
+
+
+
+
+ + Отмена +
+
+
+
+@endsection diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php new file mode 100644 index 0000000..c2c7b2d --- /dev/null +++ b/resources/views/admin/users/edit.blade.php @@ -0,0 +1,88 @@ +@extends('layouts.app') +@section('title', 'Редактировать пользователя') +@section('content') +
+
+ +
+
+

Редактировать: {{ $user->name }}

+ Назад +
+
+ @csrf @method('PUT') +
+
+
+
+
Основная информация
+
+ + + @error('name')
{{ $message }}
@enderror +
+
+ + + @error('email')
{{ $message }}
@enderror +
+
+ + + Оставьте пустым чтобы не менять + @error('password')
{{ $message }}
@enderror +
+
+ + +
+
+
+
+
+
+
+
Настройки
+
+ + +
+
+ + +
+ @if($allGroups->count() > 0) +
+ + @foreach($allGroups as $group) +
+ id, $userGroups) ? 'checked' : '' }}> + +
+ @endforeach +
+ @endif +
+ is_active) ? 'checked' : '' }}> + +
+
+
+
+
+ + Отмена +
+
+
+
+@endsection diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php new file mode 100644 index 0000000..31e914c --- /dev/null +++ b/resources/views/admin/users/index.blade.php @@ -0,0 +1,113 @@ +@extends('layouts.app') + +@section('title', 'Пользователи') + +@section('content') +
+
+ + +
+
+

Пользователи

+ @can('create', App\Models\User::class) + + Добавить пользователя + + @endcan +
+ + @if(session('success')) +
{{ session('success') }}
+ @endif + +
+
+
+
+ +
+
+ +
+
+ +
+
+ + +
+
+
+
+ +
+
+ + + + + + + + + + + + + + @forelse($users as $user) + + + + + + + + + + @empty + + @endforelse + +
IDИмяEmailОрганизацияРольСтатусДействия
{{ $user->id }}{{ $user->name }}{{ $user->email }}{{ $user->organization?->name ?? '—' }}{{ $user->getRoleNames()->first() }} + @if($user->is_active) + Активен + @else + Не активен + @endif + +
+ + @can('update', $user) + + @endcan + @can('delete', $user) +
+ @csrf @method('DELETE') + +
+ @endcan +
+
Пользователей нет
+
+
+ {{ $users->links() }} +
+
+
+@endsection diff --git a/resources/views/admin/users/show.blade.php b/resources/views/admin/users/show.blade.php new file mode 100644 index 0000000..ff9bb85 --- /dev/null +++ b/resources/views/admin/users/show.blade.php @@ -0,0 +1,51 @@ +@extends('layouts.app') +@section('title', $user->name) +@section('content') +
+
+ +
+
+

{{ $user->name }}

+
+ @can('update', $user)Редактировать@endcan + Назад +
+
+
+
+
+
Информация
+
+ + + + + + + +
Email:{{ $user->email }}
Телефон:{{ $user->phone ?? '—' }}
Организация:{{ $user->organization?->name ?? '—' }}
Роль:{{ $user->getRoleNames()->first() }}
Статус:@if($user->is_active)Активен@elseНе активен@endif
Создан:{{ $user->created_at->format('d.m.Y H:i') }}
+
+
+
+
+
+
Группы
+
+ @if($user->groups->count() > 0) +
    + @foreach($user->groups as $group) +
  • {{ $group->name }} ({{ $group->organization?->name }})
    • + @endforeach +
+ @else +

Не состоит в группах

+ @endif +
+
+
+
+
+
+
+@endsection diff --git a/resources/views/partials/_sidebar.blade.php b/resources/views/partials/_sidebar.blade.php index 15dd8ef..864b469 100644 --- a/resources/views/partials/_sidebar.blade.php +++ b/resources/views/partials/_sidebar.blade.php @@ -15,7 +15,7 @@
  • - + Пользователи
    • diff --git a/routes/web.php b/routes/web.php index bdbfc9a..ea887e7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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); }); });