miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(users): add suspended user warning

Browse Source
This commit is contained in:
Miguel Nogueira 2022-08-19 02:08:39 +01:00
parent 0f4ce2d7b0
commit 075e9492c3
No known key found for this signature in database
GPG Key ID: 3C6A7E29AF26D370
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ban.php
View File

@ -36,7 +36,7 @@ class Ban extends Model
];
public $dates = [
'suspendedUntil',
'bannedUntil',
];
public function user()

1
app/Http/Controllers/UserController.php
View File

@ -174,6 +174,7 @@ class UserController extends Controller
'isLocked' => $suspensionService->isLocked($user),
'isSuspended' => $suspensionService->isSuspended($user),
'suspensionReason' => $suspensionService->getSuspensionReason($user),
'suspensionDuration' => $suspensionService->getSuspensionDuration($user),
'has2FA' => $user->has2FA(),
'applications' => $user->applications()->get()
]);

6
app/Services/AccountSuspensionService.php
View File

@ -124,7 +124,13 @@ class AccountSuspensionService
return ($this->isSuspended($user)) ? $user->bans->reason : false;
}
public function getSuspensionDuration(User $user): string|null {
if ($this->isSuspended($user)) {
return $user->bans->bannedUntil->diffForHumans();
}
return null;
}
/**
* Checks whether an account is locked
*

20
resources/views/dashboard/user/manage.blade.php
View File

@ -342,7 +342,25 @@
</div>
<div class="card-body">
<button onclick="$('#banAccountModal').modal('show')" type="button" class="btn btn-warning mr-3"><i class="fas fa-user-slash"></i> {{ __('Suspend account') }}</button>
@if ($isSuspended)
<x-alert extra-styling="mb-4" alert-type="danger" icon="fa fa-exclamation-triangle" title="{{ __('Account suspended') }}" >
<p><i class="fas fa-arrow-circle-right"></i>&nbsp;{{ __('This account has been :suspensionType suspended.', ['suspensionType' => (is_null($suspensionDuration)) ? __('permanently') : __('temporarily') ]) }}</p>
<p><i class="fas fa-arrow-circle-right"></i>&nbsp;{!! __('<b>Reason: </b>:reason', ['reason' => $suspensionReason]) !!}</p>
<p><i class="fas fa-arrow-circle-right"></i>&nbsp;{!! __('<b>Suspension expires: </b>:duration', ['duration' => $suspensionDuration]) !!}</p>
</x-alert>
@endif
@if (!$isSuspended)
<button onclick="$('#banAccountModal').modal('show')" type="button" class="btn btn-warning mr-3"><i class="fas fa-user-slash"></i> {{ __('Suspend account') }}</button>
@else
<form class="d-inline" method="post" action="{{ route('unbanUser', ['user' => $user]) }}">
@csrf
@method('DELETE')
<button type="submit" class="btn btn-success mr-2"><i class="fas fa-user"></i> {{ __('Unsuspend account') }}</button>
</form>
@endif
<button onclick="$('#deleteAccount').modal('show')" type="button" class="btn btn-danger"><i class="fas fa-trash"></i> {{ __('Delete account') }}</button>
</div>
</div>