From f7d8203a8aa6ac1d5cf1898e03458a57f6e7e127 Mon Sep 17 00:00:00 2001 From: Tobi Date: Wed, 28 Aug 2024 23:55:18 +0200 Subject: [PATCH] fix: fix tests for new jetstream livewire --- .../views/api/api-token-manager.blade.php | 64 +++++++++---------- .../views/auth/confirm-password.blade.php | 16 ++--- .../views/auth/forgot-password.blade.php | 16 ++--- resources/views/auth/login.blade.php | 22 +++---- resources/views/auth/register.blade.php | 34 +++++----- resources/views/auth/reset-password.blade.php | 24 +++---- .../views/auth/two-factor-challenge.blade.php | 20 +++--- resources/views/auth/verify-email.blade.php | 10 +-- resources/views/dashboard.blade.php | 2 +- resources/views/layouts/app.blade.php | 2 +- resources/views/navigation-menu.blade.php | 38 +++++------ resources/views/policy.blade.php | 2 +- .../views/profile/delete-user-form.blade.php | 24 +++---- ...gout-other-browser-sessions-form.blade.php | 28 ++++---- resources/views/profile/show.blade.php | 8 +-- .../two-factor-authentication-form.blade.php | 36 +++++------ .../profile/update-password-form.blade.php | 30 ++++----- .../update-profile-information-form.blade.php | 36 +++++------ resources/views/terms.blade.php | 2 +- .../components/action-section.blade.php | 4 +- .../components/confirmation-modal.blade.php | 4 +- .../components/confirms-password.blade.php | 16 ++--- .../components/dialog-modal.blade.php | 4 +- .../components/form-section.blade.php | 4 +- .../components/switchable-team.blade.php | 2 +- 25 files changed, 224 insertions(+), 224 deletions(-) diff --git a/resources/views/api/api-token-manager.blade.php b/resources/views/api/api-token-manager.blade.php index 31ab5c3..3811e31 100644 --- a/resources/views/api/api-token-manager.blade.php +++ b/resources/views/api/api-token-manager.blade.php @@ -1,6 +1,6 @@
- + {{ __('Create API Token') }} @@ -12,21 +12,21 @@
- - + - +
@if (Laravel\Jetstream\Jetstream::hasPermissions())
- +
@foreach (Laravel\Jetstream\Jetstream::$permissions as $permission) @endforeach @@ -36,22 +36,22 @@ - + {{ __('Created.') }} - + - + {{ __('Create') }} - + - + @if ($this->user->tokens->isNotEmpty()) - +
- + {{ __('Manage API Tokens') }} @@ -92,12 +92,12 @@ @endforeach
- +
@endif - + {{ __('API Token') }} @@ -107,7 +107,7 @@ {{ __('Please copy your new API token. For your security, it won\'t be shown again.') }}
- - + {{ __('Close') }} - +
- + - + {{ __('API Token Permissions') }} @@ -131,7 +131,7 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full
@foreach (Laravel\Jetstream\Jetstream::$permissions as $permission) @endforeach @@ -139,19 +139,19 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full - {{ __('Cancel') }} - + - + {{ __('Save') }} - + - + - + {{ __('Delete API Token') }} @@ -161,13 +161,13 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full - + {{ __('Cancel') }} - + - + {{ __('Delete') }} - + - +
diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php index 8549cab..92ad676 100644 --- a/resources/views/auth/confirm-password.blade.php +++ b/resources/views/auth/confirm-password.blade.php @@ -1,29 +1,29 @@ - + - +
{{ __('This is a secure area of the application. Please confirm your password before continuing.') }}
- +
@csrf
- - +
- + {{ __('Confirm') }} - +
-
+
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 8b5dc5c..4e3aee6 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -1,7 +1,7 @@ - + - +
@@ -14,22 +14,22 @@
@endif - +
@csrf
- - +
- + {{ __('Email Password Reset Link') }} - +
-
+
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 581637d..c809fb4 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,11 +1,11 @@
- + - + - + @if (session('status'))
@@ -18,21 +18,21 @@

Please sign in

- - +
- - +
@@ -45,11 +45,11 @@ @endif - + {{ __('Log in') }} - +
-
+
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 3b6ff3b..620f738 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,48 +1,48 @@
- + - + - +
@csrf
- - +
- - +
- - +
- - +
@if (Laravel\Jetstream\Jetstream::hasTermsAndPrivacyPolicyFeature())
- +
- +
{!! __('I agree to the :terms_of_service and :privacy_policy', [ @@ -51,7 +51,7 @@ ]) !!}
-
+
@endif @@ -60,11 +60,11 @@ {{ __('Already registered?') }} - + {{ __('Register') }} - +
- + diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php index 96c884d..3ebb572 100644 --- a/resources/views/auth/reset-password.blade.php +++ b/resources/views/auth/reset-password.blade.php @@ -1,10 +1,10 @@ - + - + - +
@csrf @@ -12,28 +12,28 @@
- - +
- - +
- - +
- + {{ __('Reset Password') }} - +
-
+
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php index b36953c..d83222a 100644 --- a/resources/views/auth/two-factor-challenge.blade.php +++ b/resources/views/auth/two-factor-challenge.blade.php @@ -1,7 +1,7 @@ - + - +
@@ -13,20 +13,20 @@ {{ __('Please confirm access to your account by entering one of your emergency recovery codes.') }}
- +
@csrf
- - +
- - +
@@ -49,11 +49,11 @@ {{ __('Use an authentication code') }} - + {{ __('Log in') }} - +
-
+
diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index 4bbc20a..285e2db 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -1,7 +1,7 @@ - + - +
@@ -19,9 +19,9 @@ @csrf
- + {{ __('Resend Verification Email') }} - +
@@ -33,5 +33,5 @@
-
+
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 5bdc540..216a338 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -10,7 +10,7 @@
- +
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index ff9b788..4415c4a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -26,7 +26,7 @@ @if( !App::environment(['Production','prd','PROD']))
{{App::environment()}} Test
@endif - +
diff --git a/resources/views/navigation-menu.blade.php b/resources/views/navigation-menu.blade.php index f44fbb1..f17f654 100644 --- a/resources/views/navigation-menu.blade.php +++ b/resources/views/navigation-menu.blade.php @@ -18,9 +18,9 @@ class="navbar-toggler" @if(Auth::user() != null && Auth::user()->hasPermissionTo('createPresent')) @@ -28,9 +28,9 @@ class="navbar-toggler" @if(Auth::user() != null && Auth::user()->hasPermissionTo('releasePresent')) @@ -66,7 +66,7 @@ class="nav-link px-3">Register @if (Laravel\Jetstream\Jetstream::hasTeamFeatures())
- +
@foreach (Auth::user()->allTeams() as $team) - + @endforeach
- + @endif @if (Laravel\Jetstream\Jetstream::managesProfilePhotos()) @@ -146,22 +146,22 @@ class="d-none d-sm-inline mx-1">{{ Auth::user()->name }} ({{ Auth::user()->email diff --git a/resources/views/policy.blade.php b/resources/views/policy.blade.php index a7d3d44..0fa67a4 100644 --- a/resources/views/policy.blade.php +++ b/resources/views/policy.blade.php @@ -2,7 +2,7 @@
- +
diff --git a/resources/views/profile/delete-user-form.blade.php b/resources/views/profile/delete-user-form.blade.php index 9b4a451..c62e575 100644 --- a/resources/views/profile/delete-user-form.blade.php +++ b/resources/views/profile/delete-user-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Delete Account') }} @@ -13,13 +13,13 @@
- + {{ __('Delete Account') }} - +
- + {{ __('Delete Account') }} @@ -29,25 +29,25 @@
- - +
- + {{ __('Cancel') }} - + - + {{ __('Delete Account') }} - + -
+ - + diff --git a/resources/views/profile/logout-other-browser-sessions-form.blade.php b/resources/views/profile/logout-other-browser-sessions-form.blade.php index 64e0204..e5049bc 100644 --- a/resources/views/profile/logout-other-browser-sessions-form.blade.php +++ b/resources/views/profile/logout-other-browser-sessions-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Browser Sessions') }} @@ -57,17 +57,17 @@ class="bi bi-phone" viewBox="0 0 16 16"> @endif
- + {{ __('Log Out Other Browser Sessions') }} - + - + {{ __('Done.') }} - +
- + {{ __('Log Out Other Browser Sessions') }} @@ -77,27 +77,27 @@ class="bi bi-phone" viewBox="0 0 16 16">
- - +
- + {{ __('Cancel') }} - + - {{ __('Log Out Other Browser Sessions') }} - + -
+ -
+ diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index 6395a12..491311a 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -12,7 +12,7 @@ @if (Laravel\Fortify\Features::canUpdateProfileInformation()) @livewire('profile.update-profile-information-form') - + @endif @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::updatePasswords())) @@ -20,7 +20,7 @@ @livewire('profile.update-password-form')
- + @endif @if (Laravel\Fortify\Features::canManageTwoFactorAuthentication()) @@ -28,7 +28,7 @@ @livewire('profile.two-factor-authentication-form')
- + @endif
@@ -36,7 +36,7 @@
@if (Laravel\Jetstream\Jetstream::hasAccountDeletionFeatures()) - +
@livewire('profile.delete-user-form') diff --git a/resources/views/profile/two-factor-authentication-form.blade.php b/resources/views/profile/two-factor-authentication-form.blade.php index 88d8f38..65f359f 100644 --- a/resources/views/profile/two-factor-authentication-form.blade.php +++ b/resources/views/profile/two-factor-authentication-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Two Factor Authentication') }} @@ -52,32 +52,32 @@
@if (! $this->enabled) - - + + {{ __('Enable') }} - - + + @else @if ($showingRecoveryCodes) - - + + {{ __('Regenerate Recovery Codes') }} - - + + @else - - + + {{ __('Show Recovery Codes') }} - - + + @endif - - + + {{ __('Disable') }} - - + + @endif
-
+ diff --git a/resources/views/profile/update-password-form.blade.php b/resources/views/profile/update-password-form.blade.php index 8ca8440..02b3bd9 100644 --- a/resources/views/profile/update-password-form.blade.php +++ b/resources/views/profile/update-password-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Update Password') }} @@ -9,34 +9,34 @@
- - + - +
- - + - +
- - + - +
- + {{ __('Saved.') }} - + - + {{ __('Save') }} - + -
+ diff --git a/resources/views/profile/update-profile-information-form.blade.php b/resources/views/profile/update-profile-information-form.blade.php index 59f18cf..69b935a 100644 --- a/resources/views/profile/update-profile-information-form.blade.php +++ b/resources/views/profile/update-profile-information-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Profile Information') }} @@ -24,7 +24,7 @@ reader.readAsDataURL($refs.photo.files[0]); "/> - +
@@ -39,43 +39,43 @@ class="rounded-full h-20 w-20 object-cover">
- + {{ __('Select A New Photo') }} - + @if ($this->user->profile_photo_path) - + {{ __('Remove Photo') }} - + @endif - +
@endif
- - + - +
- - - + + +
- + {{ __('Saved.') }} - + - + {{ __('Save') }} - + - + diff --git a/resources/views/terms.blade.php b/resources/views/terms.blade.php index f3adf7e..e45e919 100644 --- a/resources/views/terms.blade.php +++ b/resources/views/terms.blade.php @@ -2,7 +2,7 @@
- +
diff --git a/resources/views/vendor/jetstream/components/action-section.blade.php b/resources/views/vendor/jetstream/components/action-section.blade.php index 4ab1ce9..93e2434 100644 --- a/resources/views/vendor/jetstream/components/action-section.blade.php +++ b/resources/views/vendor/jetstream/components/action-section.blade.php @@ -1,8 +1,8 @@
merge(['class' => 'md:grid md:grid-cols-3 md:gap-6']) }}> - + {{ $title }} {{ $description }} - +
diff --git a/resources/views/vendor/jetstream/components/confirmation-modal.blade.php b/resources/views/vendor/jetstream/components/confirmation-modal.blade.php index 3c77360..fbefa6f 100644 --- a/resources/views/vendor/jetstream/components/confirmation-modal.blade.php +++ b/resources/views/vendor/jetstream/components/confirmation-modal.blade.php @@ -1,6 +1,6 @@ @props(['id' => null, 'maxWidth' => null]) - +
{{ $footer }}
- + diff --git a/resources/views/vendor/jetstream/components/confirms-password.blade.php b/resources/views/vendor/jetstream/components/confirms-password.blade.php index 62a145a..78e75bb 100644 --- a/resources/views/vendor/jetstream/components/confirms-password.blade.php +++ b/resources/views/vendor/jetstream/components/confirms-password.blade.php @@ -15,7 +15,7 @@ @once - + {{ $title }} @@ -25,24 +25,24 @@
- - +
- + {{ __('Cancel') }} - + - {{ $button }} - + -
+ @endonce diff --git a/resources/views/vendor/jetstream/components/dialog-modal.blade.php b/resources/views/vendor/jetstream/components/dialog-modal.blade.php index 1f975ad..f6787da 100644 --- a/resources/views/vendor/jetstream/components/dialog-modal.blade.php +++ b/resources/views/vendor/jetstream/components/dialog-modal.blade.php @@ -1,6 +1,6 @@ @props(['id' => null, 'maxWidth' => null]) - +
{{ $title }} @@ -14,4 +14,4 @@
{{ $footer }}
- + diff --git a/resources/views/vendor/jetstream/components/form-section.blade.php b/resources/views/vendor/jetstream/components/form-section.blade.php index 5f11f0b..d72eafb 100644 --- a/resources/views/vendor/jetstream/components/form-section.blade.php +++ b/resources/views/vendor/jetstream/components/form-section.blade.php @@ -1,11 +1,11 @@ @props(['submit'])
merge(['class' => 'mb-3']) }}> - + {{ $title }} {{ $description }} - +
diff --git a/resources/views/vendor/jetstream/components/switchable-team.blade.php b/resources/views/vendor/jetstream/components/switchable-team.blade.php index a38f09f..95e8b2c 100644 --- a/resources/views/vendor/jetstream/components/switchable-team.blade.php +++ b/resources/views/vendor/jetstream/components/switchable-team.blade.php @@ -1,4 +1,4 @@ -@props(['team', 'component' => 'jet-dropdown-link']) +@props(['team', 'component' => 'dropdown-link']) @method('PUT')