QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-15 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split CompanyController and introduce standalone User Settings page

Browse Source 
Backend:
- Extract user profile methods (show, update, uploadAvatar) from
  CompanyController into new UserProfileController
- CompanyController now only handles company concerns (updateCompany,
  uploadCompanyLogo)
- Remove Account Settings from setting_menu config

Frontend:
- New /admin/user-settings page with 3 tabs: General, Profile Photo,
  Security (password change)
- User dropdown now links to /admin/user-settings instead of
  /admin/settings/account-settings
- Settings sidebar defaults to Company Information as first item
- Remove old monolithic AccountSetting.vue
This commit is contained in:
Darko Gjorgjijoski
2026-04-03 17:35:41 +02:00
parent 6b5e4878fb
commit 1ca915a0a3
14 changed files with 426 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
app/Http/Controllers/V1/Admin/Settings/CompanyController.php
View File

@@ -3,48 +3,13 @@
namespace App\Http\Controllers\V1\Admin\Settings;
use App\Http\Controllers\Controller;
use App\Http\Requests\AvatarRequest;
use App\Http\Requests\CompanyLogoRequest;
use App\Http\Requests\CompanyRequest;
use App\Http\Requests\ProfileRequest;
use App\Http\Resources\CompanyResource;
use App\Http\Resources\UserResource;
use App\Models\Company;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class CompanyController extends Controller
{
/**
* Retrive the Admin account.
*
* @return JsonResponse
*/
public function getUser(Request $request)
{
return new UserResource($request->user());
}
/**
* Update the Admin profile.
* Includes name, email and (or) password
*
* @return JsonResponse
*/
public function updateProfile(ProfileRequest $request)
{
$user = $request->user();
$user->update($request->validated());
return new UserResource($user);
}
/**
* Update Admin Company Details
*
* @return JsonResponse
*/
public function updateCompany(CompanyRequest $request)
{
$company = Company::find($request->header('company'));
@@ -58,11 +23,6 @@ class CompanyController extends Controller
return new CompanyResource($company);
}
/**
* Upload the company logo to storage.
*
* @return JsonResponse
*/
public function uploadCompanyLogo(CompanyLogoRequest $request)
{
$company = Company::find($request->header('company'));
@@ -90,35 +50,4 @@ class CompanyController extends Controller
'success' => true,
]);
}
/**
* Upload the Admin Avatar to public storage.
*
* @return JsonResponse
*/
public function uploadAvatar(AvatarRequest $request)
{
$user = auth()->user();
if (isset($request->is_admin_avatar_removed) && (bool) $request->is_admin_avatar_removed) {
$user->clearMediaCollection('admin_avatar');
}
if ($user && $request->hasFile('admin_avatar')) {
$user->clearMediaCollection('admin_avatar');
$user->addMediaFromRequest('admin_avatar')
->toMediaCollection('admin_avatar');
}
if ($user && $request->has('avatar')) {
$data = json_decode($request->avatar);
$user->clearMediaCollection('admin_avatar');
$user->addMediaFromBase64($data->data)
->usingFileName($data->name)
->toMediaCollection('admin_avatar');
}
return new UserResource($user);
}
}

52
app/Http/Controllers/V1/Admin/Settings/UserProfileController.php Normal file
View File

@@ -0,0 +1,52 @@
<?php
namespace App\Http\Controllers\V1\Admin\Settings;
use App\Http\Controllers\Controller;
use App\Http\Requests\AvatarRequest;
use App\Http\Requests\ProfileRequest;
use App\Http\Resources\UserResource;
use Illuminate\Http\Request;
class UserProfileController extends Controller
{
public function show(Request $request)
{
return new UserResource($request->user());
}
public function update(ProfileRequest $request)
{
$user = $request->user();
$user->update($request->validated());
return new UserResource($user);
}
public function uploadAvatar(AvatarRequest $request)
{
$user = auth()->user();
if (isset($request->is_admin_avatar_removed) && (bool) $request->is_admin_avatar_removed) {
$user->clearMediaCollection('admin_avatar');
}
if ($user && $request->hasFile('admin_avatar')) {
$user->clearMediaCollection('admin_avatar');
$user->addMediaFromRequest('admin_avatar')
->toMediaCollection('admin_avatar');
}
if ($user && $request->has('avatar')) {
$data = json_decode($request->avatar);
$user->clearMediaCollection('admin_avatar');
$user->addMediaFromBase64($data->data)
->usingFileName($data->name)
->toMediaCollection('admin_avatar');
}
return new UserResource($user);
}
}