Merge pull request #1863 from GreedVal/fix-issue#1794

Fix issue#1794

Author: fey

app/DTO/Admin/UpdateUserData.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\DTO\Admin;
+
+use Spatie\LaravelData\Attributes\Validation\Nullable;
+use Spatie\LaravelData\Attributes\Validation\Required;
+use Spatie\LaravelData\Attributes\Validation\Max;
+use Spatie\LaravelData\Data;
+
+class UpdateUserData extends Data
+{
+    public function __construct(
+        #[Required]
+        #[Max(255)]
+        public string $name,
+        #[Nullable]
+        #[Max(255)]
+        public ?string $github_name,
+        #[Nullable]
+        public ?bool $is_admin,
+    ) {
+    }
+}

app/Http/Controllers/Admin/UserController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\DTO\Admin\UpdateUserData;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
@@ -23,4 +24,21 @@ public function index(Request $request): View
 
         return view('admin.users', compact('users'));
     }
+
+    public function edit(User $user)
+    {
+        return view('admin.users.edit', compact('user'));
+    }
+
+    public function update(UpdateUserData $request, User $user)
+    {
+        $user->update([
+            'name' => $request->name,
+            'github_name' => $request->github_name,
+            'is_admin' => $request->is_admin,
+        ]);
+
+        return redirect()->route('admin.users.index')
+            ->with('success', 'User updated');
+    }
 }

app/Models/User.php

@@ -22,7 +22,7 @@
  * @property string $name
  * @property string $email
  * @property string $github_name
- * @property bool $is_admin
+ * @property bool $admin
  * @property \Illuminate\Support\Carbon|null $email_verified_at
  * @property string $password
  * @property string|null $remember_token
@@ -58,7 +58,7 @@ class User extends Authenticatable implements MustVerifyEmail
      * @var string[]
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'name', 'email', 'password', 'github_name', 'is_admin',
     ];
 
     /**

app/Policies/UserPolicy.php

@@ -13,4 +13,9 @@ public function update(?User $user, User $resourceUser): bool
     {
         return $resourceUser->is($user);
     }
+
+    public function accessAdmin(User $user): bool
+    {
+        return $user->is_admin;
+    }
 }

database/seeders/UsersTableSeeder.php

@@ -2,7 +2,6 @@
 
 namespace Database\Seeders;
 
-use App\Models\Chapter;
 use App\Models\User;
 use Illuminate\Database\Seeder;
 

resources/lang/en/account.php

@@ -13,4 +13,6 @@
     'current_email' => 'Current email',
     'go_to_gravatar' => 'Go to Gravatar.com',
     'github_name' => 'GitHub username',
+    'admin' => 'Admin',
+    'name' => 'Name',
 ];

resources/lang/en/admin.php

@@ -35,6 +35,7 @@
         ],
         'empty' => 'No users found',
         'not_available' => 'N/A',
+        'edit' => 'Edit User',
     ],
     'comments' => [
         'title' => 'Comments',

resources/lang/ru/account.php

@@ -13,4 +13,6 @@
     'current_email' => 'Текущий email',
     'go_to_gravatar' => 'Перейти на Gravatar.com',
     'github_name' => 'Имя на GitHub',
+    'admin' => 'Админ',
+    'name' => 'Имя',
 ];

resources/lang/ru/admin.php

@@ -34,6 +34,7 @@
             'email_not_verified' => 'Email не подтвержден',
         ],
         'empty' => 'Пользователи не найдены',
+        'edit' => 'Редактирование пользователя',
     ],
     'comments' => [
         'title' => 'Комментарии',

resources/views/admin/users.blade.php

@@ -29,6 +29,7 @@
                                 <th>{{ __('admin.users.table.email') }}</th>
                                 <th>{{ __('admin.users.table.role') }}</th>
                                 <th>{{ __('admin.users.table.created') }}</th>
+                                <th>{{ __('admin.users.table.actions') }}</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -63,6 +64,13 @@
                                             {{ $user->created_at->format('d.m.Y H:i') }}
                                         </small>
                                     </td>
+                                    <td>
+                                      <a href="{{ route('admin.users.edit', $user) }}"
+                                         class="btn btn-sm btn-outline-primary"
+                                         title="{{ __('admin.users.edit') }}">
+                                        <i class="bi bi-pencil"></i>
+                                      </a>
+                                    </td>
                                 </tr>
                             @empty
                                 <tr>