@@ -297,8 +307,15 @@ class="far fa-check-circle fa-fw mr-1"> {{ $permission->name }}
@if ($permissions->count())
@foreach ($permissions as $permission)
-
- {{ html()->label(html()->checkbox('permissions[]', in_array($permission->name, $userPermissions), $permission->name)->id('permission-' . $permission->id) .' ' .$permission->name)->for('permission-' . $permission->id) }}
+
+ name, $userPermissions) ? 'checked' : '' }}>
+
@endforeach
@endif
diff --git a/resources/views/livewire/users-index.blade.php b/resources/views/livewire/users-index.blade.php
index 0701b790..7d31adff 100644
--- a/resources/views/livewire/users-index.blade.php
+++ b/resources/views/livewire/users-index.blade.php
@@ -1,10 +1,10 @@
-
+
-
+
| {{ __('labels.backend.users.fields.name') }} |
@@ -19,65 +19,93 @@
@foreach ($users as $user)
-
- |
-
-
- {{ $user->name }}
-
-
- |
- {{ $user->email }} |
-
- {!! $user->status_label !!}
- {!! $user->confirmed_label !!}
- |
-
- @if($user->getRoleNames()->count() > 0)
-
- @foreach ($user->getRoleNames() as $role)
- - {{ ucwords($role) }}
- @endforeach
-
- @endif
- |
-
- @if($user->getAllPermissions()->count() > 0)
-
- @foreach ($user->getDirectPermissions() as $permission)
- - {{ $permission->name }}
- @endforeach
-
- @endif
- |
-
-
- @foreach ($user->providers as $provider)
- -
- {{ label_case($provider->provider) }}
-
- @endforeach
-
- |
+
+ |
+
+
+ {{ $user->name }}
+
+
+ |
+ {{ $user->email }} |
+
+ {!! $user->status_label !!}
+ {!! $user->confirmed_label !!}
+ |
+
+ @if ($user->getRoleNames()->count() > 0)
+
+ @foreach ($user->getRoleNames() as $role)
+ -
+
+ {{ ucwords($role) }}
+
+ @endforeach
+
+ @endif
+ |
+
+ @if ($user->getAllPermissions()->count() > 0)
+
+ @foreach ($user->getDirectPermissions() as $permission)
+ - {{ $permission->name }}
+ @endforeach
+
+ @endif
+ |
+
+
+ @foreach ($user->providers as $provider)
+ -
+
+ {{ label_case($provider->provider) }}
+
+ @endforeach
+
+ |
-
-
- @can('edit_users')
-
-
- @if ($user->status != 2)
-
- @endif
- @if ($user->status == 2)
-
- @endif
-
- @if ($user->email_verified_at == null)
-
- @endif
- @endcan
- |
-
+
+
+ @can('edit_users')
+
+
+ @if ($user->status != 2)
+
+ @endif
+ @if ($user->status == 2)
+
+ @endif
+
+ @if ($user->email_verified_at == null)
+
+ @endif
+ @endcan
+ |
+
@endforeach
@@ -96,4 +124,4 @@
-
\ No newline at end of file
+
diff --git a/routes/web.php b/routes/web.php
index 1a18f91d..917c6b2e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -127,17 +127,17 @@
*/
$module_name = 'users';
$controller_name = 'UserController';
- Route::get("{$module_name}/emailConfirmationResend/{id}", ['as' => "{$module_name}.emailConfirmationResend", 'uses' => "{$controller_name}@emailConfirmationResend"]);
- Route::delete("{$module_name}/userProviderDestroy", ['as' => "{$module_name}.userProviderDestroy", 'uses' => "{$controller_name}@userProviderDestroy"]);
- Route::get("{$module_name}/changePassword/{id}", ['as' => "{$module_name}.changePassword", 'uses' => "{$controller_name}@changePassword"]);
- Route::patch("{$module_name}/changePassword/{id}", ['as' => "{$module_name}.changePasswordUpdate", 'uses' => "{$controller_name}@changePasswordUpdate"]);
+ Route::get("{$module_name}/{id}/resend-email-confirmation", ['as' => "{$module_name}.emailConfirmationResend", 'uses' => "{$controller_name}@emailConfirmationResend"]);
+ Route::delete("{$module_name}/user-provider-destroy", ['as' => "{$module_name}.userProviderDestroy", 'uses' => "{$controller_name}@userProviderDestroy"]);
+ Route::get("{$module_name}/{id}/change-password", ['as' => "{$module_name}.changePassword", 'uses' => "{$controller_name}@changePassword"]);
+ Route::patch("{$module_name}/{id}/change-password", ['as' => "{$module_name}.changePasswordUpdate", 'uses' => "{$controller_name}@changePasswordUpdate"]);
Route::get("{$module_name}/trashed", ['as' => "{$module_name}.trashed", 'uses' => "{$controller_name}@trashed"]);
- Route::patch("{$module_name}/trashed/{id}", ['as' => "{$module_name}.restore", 'uses' => "{$controller_name}@restore"]);
+ Route::patch("{$module_name}/{id}/trashed", ['as' => "{$module_name}.restore", 'uses' => "{$controller_name}@restore"]);
Route::get("{$module_name}/index_data", ['as' => "{$module_name}.index_data", 'uses' => "{$controller_name}@index_data"]);
Route::get("{$module_name}/index_list", ['as' => "{$module_name}.index_list", 'uses' => "{$controller_name}@index_list"]);
- Route::resource("{$module_name}", "{$controller_name}");
Route::patch("{$module_name}/{id}/block", ['as' => "{$module_name}.block", 'uses' => "{$controller_name}@block", 'middleware' => ['can:block_users']]);
Route::patch("{$module_name}/{id}/unblock", ['as' => "{$module_name}.unblock", 'uses' => "{$controller_name}@unblock", 'middleware' => ['can:block_users']]);
+ Route::resource("{$module_name}", "{$controller_name}");
});
/**
diff --git a/tests/Feature/BackendViewSuperAdminTest.php b/tests/Feature/BackendViewSuperAdminTest.php
new file mode 100644
index 00000000..dc7be9f8
--- /dev/null
+++ b/tests/Feature/BackendViewSuperAdminTest.php
@@ -0,0 +1,540 @@
+seed();
+
+ Artisan::call('db:seed');
+ Artisan::call('starter:insert-demo-data');
+
+ // Get Super Admin
+ $user = User::whereId(1)->first();
+
+ $this->actingAs($user);
+ }
+
+ /**
+ * Backend Dashboard Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_backend(): void
+ {
+ $response = $this->get('/admin');
+ $response->assertStatus(200);
+
+ $response = $this->get('/admin/dashboard');
+ $response->assertStatus(200);
+ }
+
+ /**
+ * Notifications Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_notifications_index(): void
+ {
+ $response = $this->get('/admin/notifications');
+
+ $response->assertStatus(200);
+ }
+
+ /**
+ * Settings Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_settings_index(): void
+ {
+ $response = $this->get('/admin/settings');
+
+ $response->assertStatus(200);
+ }
+
+ /**
+ * Backups Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_backups_index(): void
+ {
+ $response = $this->get('/admin/backups');
+
+ $response->assertStatus(200);
+ }
+
+ /**
+ * Users Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_users_index(): void
+ {
+ $response = $this->get('/admin/users');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_create_user(): void
+ {
+ $response = $this->get('/admin/users/create');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_show_user(): void
+ {
+ for ($i = 1; $i <= 5; $i++) {
+ $response = $this->get('/admin/users/'.$i);
+
+ $response->assertStatus(200);
+ }
+ }
+
+ public function test_super_admin_user_can_edit_user(): void
+ {
+ for ($i = 1; $i <= 5; $i++) {
+ $response = $this->get('/admin/users/'.$i.'/edit');
+
+ $response->assertStatus(200);
+ }
+ }
+
+ public function test_super_admin_user_can_delete_user(): void
+ {
+ $model_id = 5;
+
+ $user = User::find($model_id);
+
+ $this->assertModelExists($user);
+
+ $user->delete();
+
+ $this->assertSoftDeleted($user);
+ }
+
+ public function test_super_admin_user_can_view_trashed_user(): void
+ {
+ $model_id = 5;
+
+ $user = User::find($model_id);
+
+ $this->assertModelExists($user);
+
+ $user->delete();
+
+ $this->assertDatabaseMissing('users', [
+ 'id' => $model_id,
+ 'deleted_at' => null,
+ ]);
+ }
+
+ public function test_super_admin_user_can_restore_trashed_user(): void
+ {
+ $model_id = 5;
+
+ $response = $this->delete('/admin/users/'.$model_id);
+
+ $response->assertStatus(302);
+
+ $response->assertRedirect('/admin/users');
+
+ $user = User::withTrashed()->find($model_id)->first();
+
+ $user->restore();
+
+ $this->assertModelExists($user);
+ }
+
+ public function test_super_admin_user_can_restore_user(): void
+ {
+ $model_id = 5;
+
+ $user = User::find($model_id);
+
+ $this->assertModelExists($user);
+
+ $user->delete();
+
+ $this->assertSoftDeleted($user);
+ }
+
+ public function test_super_admin_user_can_change_password_user(): void
+ {
+ for ($i = 1; $i <= 5; $i++) {
+ $response = $this->get('/admin/users/'.$i.'/change-password');
+
+ $response->assertStatus(200);
+ }
+ }
+
+ /**
+ * Roles Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_roles_index(): void
+ {
+ $response = $this->get('/admin/roles');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_view_roles_count(): void
+ {
+ $this->assertDatabaseCount('roles', 5);
+ }
+
+ public function test_super_admin_user_can_create_role(): void
+ {
+ $response = $this->get('/admin/roles/create');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_show_role(): void
+ {
+ for ($i = 1; $i <= 5; $i++) {
+ $response = $this->get('/admin/roles/'.$i);
+
+ $response->assertStatus(200);
+ }
+ }
+
+ public function test_super_admin_user_can_edit_role(): void
+ {
+ for ($i = 1; $i <= 5; $i++) {
+ $response = $this->get('/admin/roles/'.$i.'/edit');
+
+ $response->assertStatus(200);
+ }
+ }
+
+ public function test_super_admin_user_can_delete_role(): void
+ {
+ $model_id = 5;
+
+ $user = Role::find($model_id);
+
+ $this->assertModelExists($user);
+
+ $user->delete();
+
+ // $this->assertSoftDeleted($user);
+
+ $this->assertModelMissing($user);
+ }
+
+ /**
+ * Log Viewer Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_logs_index(): void
+ {
+ $response = $this->get('/admin/log-viewer');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_view_logs_view(): void
+ {
+ $response = $this->get('/admin/log-viewer/logs');
+
+ $response->assertStatus(200);
+ }
+
+ /**
+ * Posts Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_posts_index(): void
+ {
+ $response = $this->get('/admin/posts');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_create_post(): void
+ {
+ $response = $this->get('/admin/posts/create');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_show_post(): void
+ {
+ $response = $this->get('/admin/posts/1');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_edit_post(): void
+ {
+ $response = $this->get('/admin/posts/1/edit');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_delete_post(): void
+ {
+ $model_id = 5;
+
+ $model = Post::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertSoftDeleted($model);
+ }
+
+ public function test_super_admin_user_can_view_trashed_post(): void
+ {
+ $model_id = 5;
+
+ $model = Post::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertDatabaseMissing('posts', [
+ 'id' => $model_id,
+ 'deleted_at' => null,
+ ]);
+ }
+
+ public function test_super_admin_user_can_restore_trashed_post(): void
+ {
+ $model_id = 5;
+
+ $response = $this->delete('/admin/posts/'.$model_id);
+
+ $response->assertStatus(302);
+
+ $response->assertRedirect('/admin/posts');
+
+ $model = Post::withTrashed()->find($model_id)->first();
+
+ $model->restore();
+
+ $this->assertModelExists($model);
+ }
+
+ public function test_super_admin_user_can_restore_post(): void
+ {
+ $model_id = 5;
+
+ $model = Post::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertSoftDeleted($model);
+ }
+
+ /**
+ * Categories Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_categories_index(): void
+ {
+ $response = $this->get('/admin/categories');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_create_category(): void
+ {
+ $response = $this->get('/admin/categories/create');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_show_category(): void
+ {
+ $response = $this->get('/admin/categories/1');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_edit_category(): void
+ {
+ $response = $this->get('/admin/categories/1/edit');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_delete_category(): void
+ {
+ $model_id = 5;
+
+ $model = Category::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertSoftDeleted($model);
+ }
+
+ public function test_super_admin_user_can_view_trashed_category(): void
+ {
+ $model_id = 5;
+
+ $model = Category::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertDatabaseMissing('categories', [
+ 'id' => $model_id,
+ 'deleted_at' => null,
+ ]);
+ }
+
+ public function test_super_admin_user_can_restore_trashed_category(): void
+ {
+ $model_id = 5;
+
+ $response = $this->delete('/admin/categories/'.$model_id);
+
+ $response->assertStatus(302);
+
+ $response->assertRedirect('/admin/categories');
+
+ $model = Category::withTrashed()->find($model_id)->first();
+
+ $model->restore();
+
+ $this->assertModelExists($model);
+ }
+
+ public function test_super_admin_user_can_restore_category(): void
+ {
+ $model_id = 5;
+
+ $model = Category::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertSoftDeleted($model);
+ }
+
+ /**
+ * Tags Test.
+ *
+ * ---------------------------------------------------------------
+ */
+ public function test_super_admin_user_can_view_tags_index(): void
+ {
+ $response = $this->get('/admin/tags');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_create_tag(): void
+ {
+ $response = $this->get('/admin/tags/create');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_show_tag(): void
+ {
+ $response = $this->get('/admin/tags/1');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_edit_tag(): void
+ {
+ $response = $this->get('/admin/tags/1/edit');
+
+ $response->assertStatus(200);
+ }
+
+ public function test_super_admin_user_can_delete_tag(): void
+ {
+ $model_id = 5;
+
+ $model = Tag::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertSoftDeleted($model);
+ }
+
+ public function test_super_admin_user_can_view_trashed_tag(): void
+ {
+ $model_id = 5;
+
+ $model = Tag::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertDatabaseMissing('tags', [
+ 'id' => $model_id,
+ 'deleted_at' => null,
+ ]);
+ }
+
+ public function test_super_admin_user_can_restore_trashed_tag(): void
+ {
+ $model_id = 5;
+
+ $response = $this->delete('/admin/tags/'.$model_id);
+
+ $response->assertStatus(302);
+
+ $response->assertRedirect('/admin/tags');
+
+ $model = Tag::withTrashed()->find($model_id)->first();
+
+ $model->restore();
+
+ $this->assertModelExists($model);
+ }
+
+ public function test_super_admin_user_can_restore_tag(): void
+ {
+ $model_id = 5;
+
+ $model = Tag::find($model_id);
+
+ $this->assertModelExists($model);
+
+ $model->delete();
+
+ $this->assertSoftDeleted($model);
+ }
+}
 }}){kind=logo}
-  }}){kind=logo}
+