Fix backend code styling

This commit is contained in:
MakingCG
2021-07-17 18:38:41 +00:00
committed by GitHub Actions
parent 9ba3d9a6ba
commit ec6d11b7ae
91 changed files with 1732 additions and 1737 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,14 +1,13 @@
<?php
namespace App\Actions\Fortify;
use App\Http\Controllers\Controller;
use App\Models\User;
use App\Models\Setting;
use App\Models\UserSettings;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Validation\Rule;
use App\Http\Controllers\Controller;
use Illuminate\Auth\Events\Registered;
use Illuminate\Support\Facades\Validator;
use Illuminate\Contracts\Auth\StatefulGuard;
@@ -19,7 +18,8 @@ class CreateNewUserAction extends Controller
public function __construct(
protected StatefulGuard $guard
) {}
) {
}
/**
* Validate and create a newly registered user.
@@ -27,12 +27,12 @@ class CreateNewUserAction extends Controller
public function __invoke(Request $request): Response
{
$settings = Setting::whereIn('name', [
'storage_default', 'registration'
'storage_default', 'registration',
])
->pluck('value', 'name');
// Check if account registration is enabled
if (!intval($settings['registration'])) {
if (! intval($settings['registration'])) {
abort(401);
}
@@ -62,7 +62,7 @@ class CreateNewUserAction extends Controller
'storage_capacity' => $settings['storage_default'],
]);
if (!get_setting('user_verification')) {
if (! get_setting('user_verification')) {
$user->markEmailAsVerified();
}
@@ -70,7 +70,7 @@ class CreateNewUserAction extends Controller
event(new Registered($user));
if (!get_setting('user_verification')) {
if (! get_setting('user_verification')) {
$this->guard->login($user);
}

View File

@@ -186,7 +186,6 @@ class SetupProdEnvironment extends Command
'email' => 'howdy@hi5ve.digital',
'password' => bcrypt('vuefilemanager'),
'email_verified_at' => now(),
]);
$user

View File

@@ -1,7 +1,6 @@
<?php
namespace App\Http\Controllers\App;
use Illuminate\Http\Response;
use Schema;
use Stripe;
use Artisan;
@@ -9,6 +8,7 @@ use App\Models\User;
use App\Models\Setting;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Services\SetupService;
use App\Services\StripeService;
use Illuminate\Support\Facades\DB;

View File

@@ -26,7 +26,7 @@ class AuthController extends Controller
return [
'name' => $user->settings->name,
'avatar' => $user->settings->avatar,
'verified' => $user->email_verified_at ? true : false
'verified' => $user->email_verified_at ? true : false,
];
}
}

View File

@@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\Auth;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Lang;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
{

View File

@@ -1,23 +1,22 @@
<?php
namespace App\Http\Controllers\User;
use App\Models\User;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\RedirectResponse;
use Laravel\Sanctum\PersonalAccessToken;
use App\Http\Resources\InvoiceCollection;
use Illuminate\Support\Facades\Validator;
use App\Http\Resources\UserStorageResource;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\User\UpdateUserPasswordRequest;
use App\Http\Requests\User\UserCreateAccessTokenRequest;
use Illuminate\Support\Str;
use Laravel\Sanctum\PersonalAccessToken;
class AccountController extends Controller
{
@@ -148,13 +147,13 @@ class AccountController extends Controller
{
// Check if is demo
abort_if(is_demo_account('howdy@hi5ve.digital'), 201, [
"name" => "token",
"token" => Str::random(40),
"abilities" => '["*"]',
"tokenable_id" => Str::uuid(),
"updated_at" => now(),
"created_at" => now(),
"id" => Str::random(40),
'name' => 'token',
'token' => Str::random(40),
'abilities' => '["*"]',
'tokenable_id' => Str::uuid(),
'updated_at' => now(),
'created_at' => now(),
'id' => Str::random(40),
]);
$token = Auth::user()->createToken($request->input('name'));
@@ -176,15 +175,15 @@ class AccountController extends Controller
return response('Deleted!', 204);
}
public function email_verification(string $id, Request $request): RedirectResponse|Response
public function email_verification(string $id, Request $request): RedirectResponse | Response
{
if (!$request->hasValidSignature()) {
return response("Invalid or expired url provided.", 401);
if (! $request->hasValidSignature()) {
return response('Invalid or expired url provided.', 401);
}
$user = User::find($id);
if (!$user->hasVerifiedEmail()) {
if (! $user->hasVerifiedEmail()) {
$user->markEmailAsVerified();
}
@@ -196,11 +195,11 @@ class AccountController extends Controller
$user = User::whereEmail($request->input('email'))->first();
if ($user->hasVerifiedEmail()) {
return response("Email was already verified.", 204);
return response('Email was already verified.', 204);
}
$user->sendEmailVerificationNotification();
return response("Email verification link sent to your email", 204);
return response('Email verification link sent to your email', 204);
}
}

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\FileFunctions;
use App\Rules\DisabledMimetypes;

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\User;
use Illuminate\Foundation\Http\FormRequest;

View File

@@ -12,9 +12,9 @@ use App\Notifications\ResetPassword;
use Illuminate\Support\Facades\Storage;
use Illuminate\Notifications\Notifiable;
use Laravel\Fortify\TwoFactorAuthenticatable;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Contracts\Auth\MustVerifyEmail;
class User extends Authenticatable implements MustVerifyEmail
{

View File

@@ -3,7 +3,6 @@ namespace App\Providers;
use Illuminate\Http\Request;
use Laravel\Fortify\Fortify;
use App\Actions\Fortify\CreateNewUserAction;
use Illuminate\Support\ServiceProvider;
use Illuminate\Cache\RateLimiting\Limit;
use App\Actions\Fortify\ResetUserPassword;

View File

@@ -481,7 +481,7 @@ return [
'page_sign_in.2fa_recovery_text' => "Can't get your 2FA code?",
'page_sign_in.2fa_recovery_button' => 'Use recovery code.',
'page_sign_in.2fa_recovery_subtitle' => 'Use your recovery code',
'page_sign_in.placeholder_2fa_recovery' => "Type your recovery code",
'page_sign_in.placeholder_2fa_recovery' => 'Type your recovery code',
'page_not_verified.subtitle' => 'Your account is not verified. Before login, verify your account please.',
'page_not_verified.resend_text' => 'Do you want resend verification email?',
'page_not_verified.resend_button' => 'Resend verification email.',