improve code in controller and form request for V3 whit pint package
This commit is contained in:
@@ -2,21 +2,20 @@
|
||||
|
||||
namespace App\Http\Controllers\V3;
|
||||
|
||||
use App\Facades\File\FileFacade;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\V3\Profile\ChangePasswordRequest;
|
||||
use App\Http\Requests\V3\Profile\EditRequest;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
class ProfileController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
|
||||
public function info(): JsonResponse
|
||||
{
|
||||
$user = Auth::user();
|
||||
@@ -32,7 +31,7 @@ class ProfileController extends Controller
|
||||
'degree' => $user->degree,
|
||||
'mobile' => $user->mobile,
|
||||
'province_id' => $user->province_id,
|
||||
'avatar' => $user->avatarUrl()
|
||||
'avatar' => $user->avatarUrl(),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -40,16 +39,15 @@ class ProfileController extends Controller
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
if ($request->has('avatar'))
|
||||
{
|
||||
if ($request->has('avatar')) {
|
||||
if ($user->avatar) {
|
||||
File::delete($user->avatar);
|
||||
}
|
||||
|
||||
$destinationPath = 'avatar/' . $user->username;
|
||||
$filename = time() .".". $request->file('avatar')->getClientOriginalExtension();
|
||||
$destinationPath = 'avatar/'.$user->username;
|
||||
$filename = time().'.'.$request->file('avatar')->getClientOriginalExtension();
|
||||
$request->file('avatar')->storeAs($destinationPath, $filename, 'public');
|
||||
$avatar = 'storage/'.$destinationPath ."/". $filename;
|
||||
$avatar = 'storage/'.$destinationPath.'/'.$filename;
|
||||
}
|
||||
|
||||
$user->update([
|
||||
@@ -58,7 +56,7 @@ class ProfileController extends Controller
|
||||
'major' => $request->major,
|
||||
'degree' => $request->degree,
|
||||
'mobile' => $request->mobile,
|
||||
'avatar' => $avatar ?? $user->avatar
|
||||
'avatar' => $avatar ?? $user->avatar,
|
||||
]);
|
||||
|
||||
return $this->successResponse();
|
||||
@@ -68,13 +66,12 @@ class ProfileController extends Controller
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
if (! Hash::check($request->current_password, $user->password))
|
||||
{
|
||||
if (! Hash::check($request->current_password, $user->password)) {
|
||||
return $this->errorResponse(__('messages.incorrect_current_password'));
|
||||
}
|
||||
|
||||
$user->update([
|
||||
'password' => Hash::make($request->new_password)
|
||||
'password' => Hash::make($request->new_password),
|
||||
]);
|
||||
|
||||
return $this->successResponse();
|
||||
@@ -84,6 +81,7 @@ class ProfileController extends Controller
|
||||
public function addActivity(Request $request): JsonResponse
|
||||
{
|
||||
auth()->user()->addActivityComplete($request->activityCode);
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user