Refactor user profile handling and validation messages for consistency

Author: Irvan789

app/Concerns/ProfileValidationRules.php

@@ -22,7 +22,7 @@ protected function profileRules(?string $userId = null): array
     /**
      * @return array<string, array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string>>
      */
-    protected function profileRulesErrorMessage(): array
+    protected function profileRulesErrorMessages(): array
     {
         return [
             'name.regex' => 'The name field must only contain letters, numbers, underscores, hyphens, and spaces.',

app/Livewire/Home.php

@@ -2,12 +2,13 @@
 
 namespace App\Livewire;
 
+use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Component;
 
 class Home extends Component
 {
-    public $user;
+    public ?User $user;
 
     public function mount()
     {

app/Livewire/Profile.php

@@ -5,6 +5,7 @@
 use App\Concerns\PasswordValidationRules;
 use App\Concerns\ProfileValidationRules;
 use App\Livewire\Actions\Logout;
+use App\Models\User;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
@@ -17,7 +18,7 @@ class Profile extends Component
 {
     use ProfileValidationRules, PasswordValidationRules;
 
-    public mixed $user;
+    public ?User $user;
 
     public string $name = '';
 
@@ -105,7 +106,7 @@ public function updateProfileInformation(): void
 
         $this->username = preg_replace('/[\s+]/', '_', strtolower($this->username));
 
-        $validated = $this->validate($this->profileRules($this->user->id), $this->profileRulesErrorMessage());
+        $validated = $this->validate($this->profileRules($this->user->id), $this->profileRulesErrorMessages());
 
         $this->user->fill($validated);
 

app/Livewire/Users/Profile.php

@@ -20,7 +20,7 @@ class Profile extends Component
 {
     use ProfileValidationRules, PasswordValidationRules;
 
-    public $user;
+    public ?User $user;
 
     public string $name = '';
 
@@ -100,10 +100,10 @@ public function hasUnverifiedEmail(): bool
     public function updateProfileInformation(): void
     {
         $this->name = Str::trim($this->name);
-        
+
         $this->username = preg_replace('/[\s+]/', '_', strtolower($this->username));
 
-        $validated = $this->validate($this->profileRules($this->user->id), $this->profileRulesErrorMessage());
+        $validated = $this->validate($this->profileRules($this->user->id), $this->profileRulesErrorMessages());
 
         $this->user->fill($validated);
 
@@ -130,10 +130,10 @@ public function updateProfileInformation(): void
 
     public function unlinkSocialAccount(string $provider): void
     {
-        $socialAccontsById = Social::getUserBySocialAccoutsEmail($provider, $this->user->email);
+        $socialAccontByEmail = Social::getUserBySocialAccountEmail($provider, $this->user->email);
 
-        if ($socialAccontsById->first()) {
-            $socialAccontsById->delete();
+        if ($socialAccontByEmail->first()) {
+            $socialAccontByEmail->delete();
 
             if ($provider == 'google') {
                 $this->socials_google = null;
@@ -170,7 +170,7 @@ public function deleteAccount(): void
 
         $this->user->delete();
 
-        Session::flash('status', 'User deleted successfully');
+        Session::flash('status', 'User deleted successfully!');
 
         $this->redirectRoute('users.home', navigate: true);
     }

resources/views/layouts/app.blade.php

@@ -173,7 +173,7 @@ class="hover:underline"
   </div>
 
   <script lang="js">
-    function formatUsername(event) {
+    const usernameInput = (event) => {
       event.target.value = event.target.value.replaceAll(/[^a-zA-Z0-9_]/g, "_").toLowerCase()
     }
   </script>

resources/views/livewire/profile.blade.php

@@ -57,7 +57,7 @@ class="cursor-pointer hover:underline"
         label="Username"
         type="text"
         wire:model="username"
-        x-on:input="formatUsername"
+        x-on:input="usernameInput"
       />
 
       <x-input-text

resources/views/livewire/users/profile.blade.php

@@ -29,7 +29,7 @@ class="size-24 rounded-full"
         label="Username"
         type="text"
         wire:model="username"
-        x-on:input="formatUsername"
+        x-on:input="usernameInput"
       />
 
       <x-input-text