Skip to content

Commit be5b890

Browse files
committed
Added proper option to delete users
Users links will now NOT be deleted anymore if blocked.
1 parent 9a38e06 commit be5b890

3 files changed

Lines changed: 25 additions & 4 deletions

File tree

app/Http/Controllers/AdminController.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function searchUser(request $request)
6565
return view('panel/users', $data);
6666
}
6767

68-
//Block user and delete their links
68+
//Block user
6969
public function blockUser(request $request)
7070
{
7171
$id = $request->id;
@@ -79,8 +79,6 @@ public function blockUser(request $request)
7979

8080
User::where('id', $id)->update(['block' => $block]);
8181

82-
Link::where('user_id', $id)->delete();
83-
8482
return redirect('panel/users/all');
8583
}
8684

@@ -131,6 +129,17 @@ function random_str(
131129
return redirect('panel/edit-user/'. $user->id);
132130
}
133131

132+
//Delete existing user
133+
public function deleteUser(request $request)
134+
{
135+
$id = $request->id;
136+
137+
$user = User::find($id);
138+
$user->forceDelete();
139+
140+
return redirect('panel/users/all');
141+
}
142+
134143
//Show user to edit
135144
public function showUser(request $request)
136145
{
@@ -191,7 +200,7 @@ public function editUser(request $request)
191200
$profilePhoto->move(base_path('/img'), $littlelink_name . ".png");
192201
}
193202

194-
return back();
203+
return redirect('panel/users/all');
195204
}
196205

197206
//Show site pages to edit

resources/views/panel/users.blade.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<th scope="col">Links</th>
2828
@if(env('REGISTER_AUTH') !== 'auth')<th style="width:10%" scope="col">E-Mail Verified</th>@endif
2929
<th scope="col">Block</th>
30+
<th style="width:8%" scope="col">Delete user</th>
3031
</tr>
3132
</thead>
3233
<tbody>
@@ -39,6 +40,16 @@
3940
<td><a href="{{ route('showLinksUser', $user->id ) }}" class="text-primary">View</a></td>
4041
@if(env('REGISTER_AUTH') !== 'auth')<td><a href="{{ route('verifyUser', ['verify' => '-' . $user->email_verified_at, 'id' => $user->id] ) }}" class="text-danger">@if($user->email_verified_at == '')<span>no</span>@else<span style="color:#228B22">yes</span>@endif</a></td>@endif
4142
<td><a href="{{ route('blockUser', ['block' => $user->block, 'id' => $user->id] ) }}" class="text-danger">{{ $user->block }}</a></td>
43+
<td><a href="{{ route('deleteUser', ['id' => $user->id] ) }}" class="text-danger confirmation">Delete</a></td>
44+
<script type="text/javascript">
45+
var elems = document.getElementsByClassName('confirmation');
46+
var confirmIt = function (e) {
47+
if (!confirm('Are you sure you want to delete this user? \nThis action cannot be undone!')) e.preventDefault();
48+
};
49+
for (var i = 0, l = elems.length; i < l; i++) {
50+
elems[i].addEventListener('click', confirmIt, false);
51+
}
52+
</script>
4253
</tr>
4354
@endforeach
4455
</tbody>

routes/web.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
Route::get('/panel/edit-user/{id}', [AdminController::class, 'showUser'])->name('showUser');
103103
Route::post('/panel/edit-user/{id}', [AdminController::class, 'editUser'])->name('editUser');
104104
Route::get('/panel/new-user', [AdminController::class, 'createNewUser'])->name('createNewUser');
105+
Route::get('/panel/delete-user/{id}', [AdminController::class, 'deleteUser'])->name('deleteUser');
105106
Route::get('/panel/pages', [AdminController::class, 'showSitePage'])->name('showSitePage');
106107
Route::post('/panel/pages', [AdminController::class, 'editSitePage'])->name('editSitePage');
107108
Route::get('/panel/advanced-config', [AdminController::class, 'showFileEditor'])->name('showFileEditor');

0 commit comments

Comments
 (0)