From 43f3b62dadf7f55c1e4e9ebb97d05054690b3b9b Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Fri, 6 May 2022 15:09:41 +0200
Subject: [PATCH 1/3] wip

---
 routes/inertia.php                            | 52 ++++++++++---------
 routes/livewire.php                           | 39 +++++++-------
 .../resources/js/Pages/Auth/VerifyEmail.vue   | 29 +++++++----
 .../Partials/UpdateProfileInformationForm.vue | 27 +++++++++-
 4 files changed, 92 insertions(+), 55 deletions(-)

diff --git a/routes/inertia.php b/routes/inertia.php
index 914205ba4..9482fee73 100644
--- a/routes/inertia.php
+++ b/routes/inertia.php
@@ -28,7 +28,7 @@
             ? config('jetstream.auth_session')
             : null;
 
-    Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware, 'verified']))], function () {
+    Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware]))], function () {
         // User & Profile...
         Route::get('/user/profile', [UserProfileController::class, 'show'])
                     ->name('profile.show');
@@ -44,32 +44,34 @@
                         ->name('current-user.destroy');
         }
 
-        // API...
-        if (Jetstream::hasApiFeatures()) {
-            Route::get('/user/api-tokens', [ApiTokenController::class, 'index'])->name('api-tokens.index');
-            Route::post('/user/api-tokens', [ApiTokenController::class, 'store'])->name('api-tokens.store');
-            Route::put('/user/api-tokens/{token}', [ApiTokenController::class, 'update'])->name('api-tokens.update');
-            Route::delete('/user/api-tokens/{token}', [ApiTokenController::class, 'destroy'])->name('api-tokens.destroy');
-        }
+        Route::group(['middleware' => 'verified'], function () {
+            // API...
+            if (Jetstream::hasApiFeatures()) {
+                Route::get('/user/api-tokens', [ApiTokenController::class, 'index'])->name('api-tokens.index');
+                Route::post('/user/api-tokens', [ApiTokenController::class, 'store'])->name('api-tokens.store');
+                Route::put('/user/api-tokens/{token}', [ApiTokenController::class, 'update'])->name('api-tokens.update');
+                Route::delete('/user/api-tokens/{token}', [ApiTokenController::class, 'destroy'])->name('api-tokens.destroy');
+            }
 
-        // Teams...
-        if (Jetstream::hasTeamFeatures()) {
-            Route::get('/teams/create', [TeamController::class, 'create'])->name('teams.create');
-            Route::post('/teams', [TeamController::class, 'store'])->name('teams.store');
-            Route::get('/teams/{team}', [TeamController::class, 'show'])->name('teams.show');
-            Route::put('/teams/{team}', [TeamController::class, 'update'])->name('teams.update');
-            Route::delete('/teams/{team}', [TeamController::class, 'destroy'])->name('teams.destroy');
-            Route::put('/current-team', [CurrentTeamController::class, 'update'])->name('current-team.update');
-            Route::post('/teams/{team}/members', [TeamMemberController::class, 'store'])->name('team-members.store');
-            Route::put('/teams/{team}/members/{user}', [TeamMemberController::class, 'update'])->name('team-members.update');
-            Route::delete('/teams/{team}/members/{user}', [TeamMemberController::class, 'destroy'])->name('team-members.destroy');
+            // Teams...
+            if (Jetstream::hasTeamFeatures()) {
+                Route::get('/teams/create', [TeamController::class, 'create'])->name('teams.create');
+                Route::post('/teams', [TeamController::class, 'store'])->name('teams.store');
+                Route::get('/teams/{team}', [TeamController::class, 'show'])->name('teams.show');
+                Route::put('/teams/{team}', [TeamController::class, 'update'])->name('teams.update');
+                Route::delete('/teams/{team}', [TeamController::class, 'destroy'])->name('teams.destroy');
+                Route::put('/current-team', [CurrentTeamController::class, 'update'])->name('current-team.update');
+                Route::post('/teams/{team}/members', [TeamMemberController::class, 'store'])->name('team-members.store');
+                Route::put('/teams/{team}/members/{user}', [TeamMemberController::class, 'update'])->name('team-members.update');
+                Route::delete('/teams/{team}/members/{user}', [TeamMemberController::class, 'destroy'])->name('team-members.destroy');
 
-            Route::get('/team-invitations/{invitation}', [TeamInvitationController::class, 'accept'])
-                        ->middleware(['signed'])
-                        ->name('team-invitations.accept');
+                Route::get('/team-invitations/{invitation}', [TeamInvitationController::class, 'accept'])
+                            ->middleware(['signed'])
+                            ->name('team-invitations.accept');
 
-            Route::delete('/team-invitations/{invitation}', [TeamInvitationController::class, 'destroy'])
-                        ->name('team-invitations.destroy');
-        }
+                Route::delete('/team-invitations/{invitation}', [TeamInvitationController::class, 'destroy'])
+                            ->name('team-invitations.destroy');
+            }
+        });
     });
 });
diff --git a/routes/livewire.php b/routes/livewire.php
index be2111717..8d44bd625 100644
--- a/routes/livewire.php
+++ b/routes/livewire.php
@@ -24,25 +24,26 @@
             ? config('jetstream.auth_session')
             : null;
 
-    Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware, 'verified']))], function () {
+    Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware]))], function () {
         // User & Profile...
-        Route::get('/user/profile', [UserProfileController::class, 'show'])
-                    ->name('profile.show');
-
-        // API...
-        if (Jetstream::hasApiFeatures()) {
-            Route::get('/user/api-tokens', [ApiTokenController::class, 'index'])->name('api-tokens.index');
-        }
-
-        // Teams...
-        if (Jetstream::hasTeamFeatures()) {
-            Route::get('/teams/create', [TeamController::class, 'create'])->name('teams.create');
-            Route::get('/teams/{team}', [TeamController::class, 'show'])->name('teams.show');
-            Route::put('/current-team', [CurrentTeamController::class, 'update'])->name('current-team.update');
-
-            Route::get('/team-invitations/{invitation}', [TeamInvitationController::class, 'accept'])
-                        ->middleware(['signed'])
-                        ->name('team-invitations.accept');
-        }
+        Route::get('/user/profile', [UserProfileController::class, 'show'])->name('profile.show');
+
+        Route::group(['middleware' => 'verified'], function () {
+            // API...
+            if (Jetstream::hasApiFeatures()) {
+                Route::get('/user/api-tokens', [ApiTokenController::class, 'index'])->name('api-tokens.index');
+            }
+
+            // Teams...
+            if (Jetstream::hasTeamFeatures()) {
+                Route::get('/teams/create', [TeamController::class, 'create'])->name('teams.create');
+                Route::get('/teams/{team}', [TeamController::class, 'show'])->name('teams.show');
+                Route::put('/current-team', [CurrentTeamController::class, 'update'])->name('current-team.update');
+
+                Route::get('/team-invitations/{invitation}', [TeamInvitationController::class, 'accept'])
+                            ->middleware(['signed'])
+                            ->name('team-invitations.accept');
+            }
+        });
     });
 });
diff --git a/stubs/inertia/resources/js/Pages/Auth/VerifyEmail.vue b/stubs/inertia/resources/js/Pages/Auth/VerifyEmail.vue
index 58eddaac8..1398a1785 100644
--- a/stubs/inertia/resources/js/Pages/Auth/VerifyEmail.vue
+++ b/stubs/inertia/resources/js/Pages/Auth/VerifyEmail.vue
@@ -27,11 +27,11 @@ const verificationLinkSent = computed(() => props.status === 'verification-link-
         </template>
 
         <div class="mb-4 text-sm text-gray-600">
-            Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you didn't receive the email, we will gladly send you another.
+            Before continuing, could you verify your email address by clicking on the link we just emailed to you? If you didn't receive the email, we will gladly send you another.
         </div>
 
         <div v-if="verificationLinkSent" class="mb-4 font-medium text-sm text-green-600">
-            A new verification link has been sent to the email address you provided during registration.
+            A new verification link has been sent to the email address in your profile settings.
         </div>
 
         <form @submit.prevent="submit">
@@ -40,14 +40,23 @@ const verificationLinkSent = computed(() => props.status === 'verification-link-
                     Resend Verification Email
                 </JetButton>
 
-                <Link
-                    :href="route('logout')"
-                    method="post"
-                    as="button"
-                    class="underline text-sm text-gray-600 hover:text-gray-900"
-                >
-                    Log Out
-                </Link>
+                <div>
+                    <Link
+                        :href="route('profile.show')"
+                        class="underline text-sm text-gray-600 hover:text-gray-900"
+                    >
+                        Edit Profile
+                    </Link>
+
+                    <Link
+                        :href="route('logout')"
+                        method="post"
+                        as="button"
+                        class="underline text-sm text-gray-600 hover:text-gray-900 ml-2"
+                    >
+                        Log Out
+                    </Link>
+                </div>
             </div>
         </form>
     </JetAuthenticationCard>
diff --git a/stubs/inertia/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue b/stubs/inertia/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
index 314a10c2b..5770e514e 100644
--- a/stubs/inertia/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
+++ b/stubs/inertia/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { Inertia } from '@inertiajs/inertia';
-import { useForm } from '@inertiajs/inertia-vue3';
+import { Link, useForm } from '@inertiajs/inertia-vue3';
 import JetButton from '@/Jetstream/Button.vue';
 import JetFormSection from '@/Jetstream/FormSection.vue';
 import JetInput from '@/Jetstream/Input.vue';
@@ -21,6 +21,7 @@ const form = useForm({
     photo: null,
 });
 
+const verificationLinkSent = ref(null);
 const photoPreview = ref(null);
 const photoInput = ref(null);
 
@@ -36,6 +37,10 @@ const updateProfileInformation = () => {
     });
 };
 
+const sendEmailVerification = () => {
+    verificationLinkSent.value = true;
+};
+
 const selectNewPhoto = () => {
     photoInput.value.click();
 };
@@ -146,6 +151,26 @@ const clearPhotoFileInput = () => {
                     class="mt-1 block w-full"
                 />
                 <JetInputError :message="form.errors.email" class="mt-2" />
+
+                <div v-show="user.email_verified_at === null">
+                    <p class="text-sm mt-2">
+                        Your email address is unverified.
+
+                        <Link
+                            :href="route('verification.send')"
+                            method="post"
+                            as="button"
+                            class="underline text-gray-600 hover:text-gray-900"
+                            @click.prevent="sendEmailVerification"
+                        >
+                            Click here to re-send the verification email.
+                        </Link>
+                    </p>
+
+                    <div v-show="verificationLinkSent" class="mt-2 font-medium text-sm text-green-600">
+                        A new verification link has been sent to the above email address you.
+                    </div>
+                </div>
             </div>
         </template>
 

From 177be093f6c8bcd92bd7351057c2aa0ae12e938a Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Fri, 6 May 2022 15:44:21 +0200
Subject: [PATCH 2/3] Add livewire side

---
 .../Livewire/UpdateProfileInformationForm.php | 19 ++++++++++++++
 .../views/auth/verify-email.blade.php         | 25 +++++++++++++------
 .../update-profile-information-form.blade.php | 16 ++++++++++++
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/src/Http/Livewire/UpdateProfileInformationForm.php b/src/Http/Livewire/UpdateProfileInformationForm.php
index ac913a66f..a2e461c5e 100644
--- a/src/Http/Livewire/UpdateProfileInformationForm.php
+++ b/src/Http/Livewire/UpdateProfileInformationForm.php
@@ -25,6 +25,13 @@ class UpdateProfileInformationForm extends Component
      */
     public $photo;
 
+    /**
+     * Determine if the verification email was sent.
+     *
+     * @var bool
+     */
+    public $verificationLinkSent = false;
+
     /**
      * Prepare the component.
      *
@@ -73,6 +80,18 @@ public function deleteProfilePhoto()
         $this->emit('refresh-navigation-menu');
     }
 
+    /**
+     * Sent the email verification.
+     *
+     * @return void
+     */
+    public function sendEmailVerification()
+    {
+        Auth::user()->sendEmailVerificationNotification();
+
+        $this->verificationLinkSent = true;
+    }
+
     /**
      * Get the current user of the application.
      *
diff --git a/stubs/livewire/resources/views/auth/verify-email.blade.php b/stubs/livewire/resources/views/auth/verify-email.blade.php
index d780c49ab..bd286eed0 100644
--- a/stubs/livewire/resources/views/auth/verify-email.blade.php
+++ b/stubs/livewire/resources/views/auth/verify-email.blade.php
@@ -5,12 +5,12 @@
         </x-slot>
 
         <div class="mb-4 text-sm text-gray-600">
-            {{ __('Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you didn\'t receive the email, we will gladly send you another.') }}
+            {{ __('Before continuing, could you verify your email address by clicking on the link we just emailed to you? If you didn\'t receive the email, we will gladly send you another.') }}
         </div>
 
         @if (session('status') == 'verification-link-sent')
             <div class="mb-4 font-medium text-sm text-green-600">
-                {{ __('A new verification link has been sent to the email address you provided during registration.') }}
+                {{ __('A new verification link has been sent to the email address in your profile settings.') }}
             </div>
         @endif
 
@@ -25,13 +25,22 @@
                 </div>
             </form>
 
-            <form method="POST" action="{{ route('logout') }}">
-                @csrf
+            <div>
+                <a
+                    href="{{ route('profile.show') }}"
+                    class="underline text-sm text-gray-600 hover:text-gray-900"
+                >
+                    Edit Profile
+                </a>
 
-                <button type="submit" class="underline text-sm text-gray-600 hover:text-gray-900">
-                    {{ __('Log Out') }}
-                </button>
-            </form>
+                <form method="POST" action="{{ route('logout') }}" class="inline">
+                    @csrf
+
+                    <button type="submit" class="underline text-sm text-gray-600 hover:text-gray-900 ml-2">
+                        {{ __('Log Out') }}
+                    </button>
+                </form>
+            </div>
         </div>
     </x-jet-authentication-card>
 </x-guest-layout>
diff --git a/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php b/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php
index b33ec0da7..ced4441ac 100644
--- a/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php
+++ b/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php
@@ -64,6 +64,22 @@
             <x-jet-label for="email" value="{{ __('Email') }}" />
             <x-jet-input id="email" type="email" class="mt-1 block w-full" wire:model.defer="state.email" />
             <x-jet-input-error for="email" class="mt-2" />
+
+            @unless ($this->user->hasVerifiedEmail())
+                <p class="text-sm mt-2">
+                    Your email address is unverified.
+
+                    <button type="button" class="underline text-sm text-gray-600 hover:text-gray-900" wire:click.prevent="sendEmailVerification">
+                        {{ __('Click here to re-send the verification email.') }}
+                    </button>
+                </p>
+
+                @if ($this->verificationLinkSent)
+                    <p v-show="verificationLinkSent" class="mt-2 font-medium text-sm text-green-600">
+                        A new verification link has been sent to the above email address you.
+                    </p>
+                @endif
+            @endif
         </div>
     </x-slot>
 

From 8c5b851adb305e46d5fcf6cc950f49d32ac56057 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Mon, 9 May 2022 20:08:37 +0200
Subject: [PATCH 3/3] Translations

---
 stubs/livewire/resources/views/auth/verify-email.blade.php    | 2 +-
 .../views/profile/update-profile-information-form.blade.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stubs/livewire/resources/views/auth/verify-email.blade.php b/stubs/livewire/resources/views/auth/verify-email.blade.php
index bd286eed0..a6caacc6e 100644
--- a/stubs/livewire/resources/views/auth/verify-email.blade.php
+++ b/stubs/livewire/resources/views/auth/verify-email.blade.php
@@ -30,7 +30,7 @@
                     href="{{ route('profile.show') }}"
                     class="underline text-sm text-gray-600 hover:text-gray-900"
                 >
-                    Edit Profile
+                    {{ __('Edit Profile') }}
                 </a>
 
                 <form method="POST" action="{{ route('logout') }}" class="inline">
diff --git a/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php b/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php
index ced4441ac..5583b3834 100644
--- a/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php
+++ b/stubs/livewire/resources/views/profile/update-profile-information-form.blade.php
@@ -67,7 +67,7 @@
 
             @unless ($this->user->hasVerifiedEmail())
                 <p class="text-sm mt-2">
-                    Your email address is unverified.
+                    {{ __('Your email address is unverified.') }}
 
                     <button type="button" class="underline text-sm text-gray-600 hover:text-gray-900" wire:click.prevent="sendEmailVerification">
                         {{ __('Click here to re-send the verification email.') }}
@@ -76,7 +76,7 @@
 
                 @if ($this->verificationLinkSent)
                     <p v-show="verificationLinkSent" class="mt-2 font-medium text-sm text-green-600">
-                        A new verification link has been sent to the above email address you.
+                        {{ __('A new verification link has been sent to the above email address you.') }}
                     </p>
                 @endif
             @endif