- admin registration fixes

- alert popup refactoring
This commit is contained in:
Čarodej
2022-03-17 12:31:09 +01:00
parent e8f59ef0a9
commit 01588fa06b
41 changed files with 288 additions and 300 deletions
@@ -9,6 +9,7 @@ use App\Users\Resources\UserResource;
use App\Users\Resources\UsersCollection;
use App\Users\Actions\CreateNewUserAction;
use Domain\Admin\Requests\CreateUserByAdmin;
use VueFileManager\Subscription\Domain\Plans\Exceptions\MeteredBillingPlanDoesntExist;
class UserController extends Controller
{
@@ -43,6 +44,7 @@ class UserController extends Controller
{
// Map user data
$data = CreateUserData::fromArray([
'role' => $request->input('role'),
'name' => $request->input('name'),
'email' => $request->input('email'),
'password' => $request->input('password'),
@@ -50,11 +52,17 @@ class UserController extends Controller
]);
// Register user
$user = ($this->createNewUser)($data);
try {
$user = ($this->createNewUser)($data);
} catch (MeteredBillingPlanDoesntExist $e) {
return response([
'type' => 'error',
'message' => 'User registrations are temporarily disabled',
], 409);
}
// Update user data
$user->email_verified_at = now();
$user->role = $request->input('role');
$user->save();
@@ -11,16 +11,19 @@ class GenerateImageThumbnailAction
public function __invoke($fileName, $userId, $execution): void
{
$localDisk = Storage::disk('local');
// Get image width
$imageWidth = getimagesize($localDisk->path("temp/$userId/$fileName"))[0];
$imageWidth = getimagesize(
Storage::disk('local')->path("temp/$userId/$fileName")
)[0];
collect(config("vuefilemanager.image_sizes.$execution"))
->each(function ($size) use ($userId, $fileName, $imageWidth) {
if ($imageWidth > $size['size']) {
// Create intervention image
$intervention = Image::make(config('filesystems.disks.local.root') . "/temp/$userId/$fileName")
$intervention = Image::make(
Storage::disk('local')->path("temp/$userId/$fileName")
)
->orientate();
// Generate thumbnail