Add Twitter handle

Author: joedixon

resources/views/users/settings/password.blade.php

@@ -13,7 +13,7 @@
 
                     @if (Auth::user()->hasPassword())
                         <div class="col-span-12">
-                            <x-label for="current_password">Current Password</x-label>
+                            <x-label for="current_password" />
                             <x-input type="password" name="current_password" required />
                         </div>
                     @endif

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

@@ -13,12 +13,12 @@
                 <div class="flex flex-col space-y-6 lg:flex-row lg:space-y-0 lg:space-x-6">
                     <div class="flex-grow space-y-6">
                         <div class="space-y-1">
-                            <x-label for="name">Name</x-label>
+                            <x-label for="name"/>
                             <x-input name="name" value="{{ Auth::user()->name() }}" required />
                         </div>
 
                         <div class="space-y-1">
-                            <x-label for="bio">Bio</x-label>
+                            <x-label for="bio"/>
                             <x-textarea name="bio" rows="3" maxlength="160">
                                 {{ Auth::user()->bio() }}
                             </x-textarea>
@@ -39,8 +39,8 @@
                 </div>
 
                 <div class="grid grid-cols-12 gap-6">
-                    <div class="col-span-12 sm:col-span-6">
-                        <x-label for="email">Email</x-label>
+                    <div class="col-span-12">
+                        <x-label for="email" />
                         <x-input type="email" name="email" value="{{ Auth::user()->emailAddress() }}" required />
                         @unless(Auth::user()->hasVerifiedEmail())
                             <span class="mt-2 text-sm text-gray-500">
@@ -51,10 +51,17 @@
                     </div>
 
                     <div class="col-span-12 sm:col-span-6">
-                        <x-label for="username">Username</x-label>
+                        <x-label for="username" />
                         <x-input name="username" value="{{ Auth::user()->username() }}" required />
                     </div>
 
+                    <div class="col-span-12 sm:col-span-6">
+                        <x-label for="twitter">Twitter handle</x-label>
+                        <x-input name="twitter" value="{{ Auth::user()->twitter() }}" prefix-icon="heroicon-o-at-symbol" />
+                        <span class="mt-2 text-sm text-gray-500">
+                            Enter your Twitter handle without the leading @ symbol
+                        </span>
+                    </div>
                 </div>
 
             </div>

resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php

@@ -1,21 +1,26 @@
 <div>
     <div class="relative">
+        @if ($attributes->get('prefix-icon'))
+            <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
+                @svg($attributes->get('prefix-icon'), ['class' => 'h-5 w-5 text-gray-400'])
+            </div>
+        @endif
         <input
             name="{{ $name }}"
             type="{{ $type }}"
             id="{{ $id }}"
             @if($value)value="{{ $value }}"@endif
             {{ $attributes->merge([
-                'class' => 'form-input block w-full sm:text-sm sm:leading-5 mt-1' . ($errors->has($name) ? ' border-red-300 text-red-900 placeholder-red-300 focus:outline-none focus:ring-red-500 focus:border-red-500' : '')
+                'class' => 'form-input block w-full sm:text-sm sm:leading-5 mt-1' . ($attributes->get('prefix-icon') ? ' pl-10' : '') . ($errors->has($name) ? ' border-red-300 text-red-900 placeholder-red-300 focus:outline-none focus:ring-red-500 focus:border-red-500' : '')
             ]) }}"
         />
-        @if($errors->has($name))
+        @if ($errors->has($name))
             <div class="absolute inset-y-0 right-0 pr-3 flex items-center pointer-events-none">
                 <x-heroicon-o-exclamation-circle class="h-5 w-5 text-red-500" />
             </div>
         @endif
     </div>
-    @if($errors->has($name))
+    @if ($errors->has($name))
         @foreach ($errors->get($name) as $error)
             <p class="mt-2 text-sm text-red-600">{{ $error }}</p>
         @endforeach

resources/views/vendor/blade-ui-kit/components/forms/label.blade.php

@@ -1,3 +1,3 @@
 <label for="{{ $for }}" {{ $attributes->merge(['class' => 'block text-sm font-medium leading-5 text-gray-700']) }}>
-    {{ $fallback }}
+    {{ $slot->isNotEmpty() ? $slot : $fallback }}
 </label>

tests/Feature/SettingsTest.php

@@ -3,8 +3,8 @@
 namespace Tests\Feature;
 
 use App\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 class SettingsTest extends BrowserKitTestCase
 {
@@ -120,7 +120,7 @@ public function twitter_is_optional()
         $this->loginAs($user);
 
         $this->visit('/settings')
-            ->submitForm('Save', [
+            ->submitForm('Update Profile', [
                 'name' => 'Freek Murze',
                 'email' => 'freek@example.com',
                 'username' => 'freekmurze',