Skip to content

Commit 812d9ef

Browse files
mckenzieartscybersoldattech
authored andcommitted
feat: [LAR-102] update Profile component
1 parent 3d9d916 commit 812d9ef

File tree

7 files changed

+7
-21
lines changed

7 files changed

+7
-21
lines changed

app/Livewire/Components/User/Profile.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ final class Profile extends Component implements HasForms
3131

3232
public ?array $data = [];
3333

34+
public User $user;
35+
3436
public string $currentUserEmail;
3537

3638
public function mount(): void
@@ -40,12 +42,6 @@ public function mount(): void
4042
$this->currentUserEmail = $this->user->email;
4143
}
4244

43-
#[Computed]
44-
public function user(): User
45-
{
46-
return Auth::user(); // @phpstan-ignore-line
47-
}
48-
4945
public function form(Form $form): Form
5046
{
5147
return $form

app/Models/User.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace App\Models;
66

77
use App\Enums\TransactionStatus;
8+
use App\Observers\UserObserver;
89
use App\Traits\HasProfilePhoto;
910
use App\Traits\HasSettings;
1011
use App\Traits\HasUsername;
@@ -13,6 +14,7 @@
1314
use Filament\Models\Contracts\HasAvatar;
1415
use Filament\Models\Contracts\HasName;
1516
use Illuminate\Contracts\Auth\MustVerifyEmail;
17+
use Illuminate\Database\Eloquent\Attributes\ObservedBy;
1618
use Illuminate\Database\Eloquent\Builder;
1719
use Illuminate\Database\Eloquent\Collection;
1820
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -59,6 +61,7 @@
5961
* @property Collection | Subscribe[] $subscriptions
6062
* @property-read Collection | SocialAccount[] $providers
6163
*/
64+
#[ObservedBy(UserObserver::class)]
6265
final class User extends Authenticatable implements FilamentUser, HasAvatar, HasMedia, HasName, MustVerifyEmail
6366
{
6467
use Gamify;

app/Observers/UserObserver.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
final class UserObserver
1010
{
11-
/**
12-
* Handle the User "updated" event.
13-
*/
1411
public function updated(User $user): void
1512
{
1613
$media = $user->getMedia('avatar')->first();

app/Providers/AppServiceProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use App\Models\Reply;
1111
use App\Models\Thread;
1212
use App\Models\User;
13-
use App\Observers\UserObserver;
1413
use App\View\Composers\InactiveDiscussionsComposer;
1514
use App\View\Composers\ProfileUsersComposer;
1615
use App\View\Composers\TopContributorsComposer;
@@ -51,7 +50,6 @@ public function boot(): void
5150
]);
5251

5352
ReplyResource::withoutWrapping();
54-
User::observe(UserObserver::class);
5553
}
5654

5755
public function registerBladeDirective(): void

public/js/ysfkaya/filament-phone-input/components/filament-phone-input.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/views/livewire/pages/account/settings.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</div>
5656
<div class="mt-10 lg:mt-0 lg:flex-1">
5757
<div x-show="activeTab === 'profile'">
58-
<livewire:components.user.profile />
58+
<livewire:components.user.profile :user="\Illuminate\Support\Facades\Auth::user()" />
5959
</div>
6060
<div x-cloak x-show="activeTab === 'password'">
6161
<livewire:components.user.password />

routes/features/account.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,4 @@
1818
Route::get('/dashboard', Account\Dashboard::class)->name('dashboard');
1919
});
2020

21-
// User
22-
Route::prefix('dashboard')->middleware(['auth', 'checkIfBanned', 'verified'])->group(function (): void {
23-
Route::get('/', Account\Dashboard::class)->name('dashboard');
24-
// Route::get('/', [User\DashboardController::class, 'dashboard'])->name('dashboard');
25-
// Route::get('/threads', [User\DashboardController::class, 'threads'])->name('threads.me');
26-
// Route::get('/discussions', [User\DashboardController::class, 'discussions'])->name('discussions.me');
27-
});
28-
2921
Route::get('/@{user:username?}', Account\Profile::class)->name('profile');

0 commit comments

Comments
 (0)