formatting

Author: taylorotwell

routes/inertia.php

@@ -5,6 +5,7 @@
 use Laravel\Jetstream\Http\Controllers\Inertia\ApiTokenController;
 use Laravel\Jetstream\Http\Controllers\Inertia\CurrentUserController;
 use Laravel\Jetstream\Http\Controllers\Inertia\OtherBrowserSessionsController;
+use Laravel\Jetstream\Http\Controllers\Inertia\ProfilePhotoController;
 use Laravel\Jetstream\Http\Controllers\Inertia\TeamController;
 use Laravel\Jetstream\Http\Controllers\Inertia\TeamMemberController;
 use Laravel\Jetstream\Http\Controllers\Inertia\UserProfileController;
@@ -22,7 +23,7 @@
         Route::delete('/user', [CurrentUserController::class, 'destroy'])
                     ->name('current-user.destroy');
 
-        Route::delete('/user/profile-photo', [CurrentUserController::class, 'deleteProfilePhoto'])
+        Route::delete('/user/profile-photo', [ProfilePhotoController::class, 'destroy'])
                     ->name('current-user-photo.destroy');
 
         // API...

src/Http/Controllers/Inertia/CurrentUserController.php

@@ -11,19 +11,6 @@
 
 class CurrentUserController extends Controller
 {
-    /**
-     * Delete the current user profile photo.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function deleteProfilePhoto(Request $request)
-    {
-        $request->user()->deleteProfilePhoto();
-
-        return back()->with('status', 'profile-photo-deleted');
-    }
-    
     /**
      * Delete the current user.
      *

src/Http/Livewire/UpdateProfileInformationForm.php

@@ -62,15 +62,11 @@ public function updateProfileInformation(UpdatesUserProfileInformation $updater)
     /**
      * Delete user's profile photo.
      *
-     * @param \Laravel\Fortify\Contracts\UpdatesUserProfileInformation $updater
-     *
      * @return void
      */
-    public function deleteProfilePhoto(UpdatesUserProfileInformation $updater)
+    public function deleteProfilePhoto()
     {
         Auth::user()->deleteProfilePhoto();
-
-        return redirect()->route('profile.show');
     }
 
     /**

stubs/inertia/resources/js/Pages/Profile/UpdateProfileInformationForm.vue

@@ -34,9 +34,9 @@
                     Select A New Photo
                 </jet-secondary-button>
 
-                <jet-button type="button" @click.native.prevent="deleteProfilePhoto" v-if="$page.user.profile_photo_path">
-                    Delete Photo
-                </jet-button>
+                <jet-secondary-button type="button" class="ml-2" @click.native.prevent="deletePhoto" v-if="$page.user.profile_photo_path">
+                    Remove Photo
+                </jet-secondary-button>
 
                 <jet-input-error :message="form.error('photo')" class="mt-2" />
             </div>
@@ -107,14 +107,6 @@
         },
 
         methods: {
-            deleteProfilePhoto() {
-                this.$inertia.delete('/user/profile-photo', {
-                    preserveScroll: true,
-                }).then(() => {
-                    this.photoPreview = null
-                });
-            },
-            
             updateProfileInformation() {
                 if (this.$refs.photo) {
                     this.form.photo = this.$refs.photo.files[0]
@@ -137,7 +129,15 @@
                 };
 
                 reader.readAsDataURL(this.$refs.photo.files[0]);
-            }
+            },
+
+            deletePhoto() {
+                this.$inertia.delete('/user/profile-photo', {
+                    preserveScroll: true,
+                }).then(() => {
+                    this.photoPreview = null
+                });
+            },
         },
     }
 </script>

stubs/livewire/resources/views/profile/update-profile-information-form.blade.php

@@ -42,10 +42,10 @@
                     Select A New Photo
                 </x-jet-secondary-button>
 
-                @if($this->user->profile_photo_path)
-                    <x-jet-button type="button" wire:click="deleteProfilePhoto">
-                        Delete Photo
-                    </x-jet-button>
+                @if ($this->user->profile_photo_path)
+                    <x-jet-secondary-button type="button" class="ml-2" wire:click="deleteProfilePhoto">
+                        Remove Photo
+                    </x-jet-secondary-button>
                 @endif
 
                 <x-jet-input-error for="photo" class="mt-2" />