added support for legacy tickets, fixed switching of modes and also style updates

This commit is contained in:
Mark Gregory
2026-09-28 15:21:32 +01:00
parent fd6646c1ee
commit 0fb4223bfc
30 changed files with 162 additions and 186 deletions
-1
View File
@@ -18,5 +18,4 @@ class Appearance extends Component
resource_path('themes/backend/views/livewire/settings/appearance.blade.php')
);
}
}
+2 -2
View File
@@ -2,9 +2,9 @@
namespace App\Livewire\Settings;
use Illuminate\Contracts\View\View;
use App\Concerns\PasswordValidationRules;
use App\Livewire\Actions\Logout;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Auth;
use Livewire\Component;
@@ -27,11 +27,11 @@ class DeleteUserForm extends Component
$this->redirect('/', navigate: true);
}
public function render(): View
{
return view()->file(
resource_path('themes/backend/views/livewire/settings/delete-user-form.blade.php')
);
}
}
+3 -3
View File
@@ -2,13 +2,13 @@
namespace App\Livewire\Settings;
use Illuminate\Contracts\View\View;
use App\Concerns\ProfileValidationRules;
use Flux\Flux;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Auth;
use Livewire\Attributes\Layout;
use Livewire\Attributes\Computed;
use Livewire\Attributes\Layout;
use Livewire\Attributes\Title;
use Livewire\Component;
@@ -83,6 +83,7 @@ class Profile extends Component
return ! $user instanceof MustVerifyEmail || $user->hasVerifiedEmail();
}
#[Layout('layouts.app')]
public function render(): View
{
@@ -90,5 +91,4 @@ class Profile extends Component
resource_path('themes/backend/views/livewire/settings/profile.blade.php')
);
}
}
+3 -3
View File
@@ -2,10 +2,10 @@
namespace App\Livewire\Settings;
use Illuminate\Contracts\View\View;
use App\Concerns\PasswordValidationRules;
use Exception;
use Flux\Flux;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Auth;
use Illuminate\Validation\ValidationException;
use Laravel\Fortify\Actions\ConfirmTwoFactorAuthentication;
@@ -14,8 +14,8 @@ use Laravel\Fortify\Actions\EnableTwoFactorAuthentication;
use Laravel\Fortify\Features;
use Laravel\Fortify\Fortify;
use Laravel\Passkeys\Actions\DeletePasskey;
use Livewire\Attributes\Layout;
use Livewire\Attributes\Computed;
use Livewire\Attributes\Layout;
use Livewire\Attributes\Locked;
use Livewire\Attributes\Title;
use Livewire\Attributes\Validate;
@@ -311,6 +311,7 @@ class Security extends Component
'buttonText' => __('Continue'),
];
}
#[Layout('layouts.app')]
public function render(): View
{
@@ -318,5 +319,4 @@ class Security extends Component
resource_path('themes/backend/views/livewire/settings/security.blade.php')
);
}
}
@@ -2,8 +2,8 @@
namespace App\Livewire\Settings\TwoFactor;
use Illuminate\Contracts\View\View;
use Exception;
use Illuminate\Contracts\View\View;
use Laravel\Fortify\Actions\GenerateNewRecoveryCodes;
use Livewire\Attributes\Locked;
use Livewire\Component;
@@ -49,11 +49,11 @@ class RecoveryCodes extends Component
}
}
}
public function render(): View
{
return view()->file(
resource_path('themes/backend/views/livewire/settings/two-factor/recovery-codes.blade.php')
);
}
}
+1 -3
View File
@@ -6,6 +6,7 @@ use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Attributes\Hidden;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Carbon;
@@ -14,7 +15,6 @@ use Laravel\Fortify\Contracts\PasskeyUser;
use Laravel\Fortify\PasskeyAuthenticatable;
use Laravel\Fortify\TwoFactorAuthenticatable;
use Modules\UserManagement\Models\Role;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
/**
* @property int $id
@@ -50,8 +50,6 @@ class User extends Authenticatable implements PasskeyUser
: $initials;
}
public function gravatarUrl(int $size = 160): string
{
$email = strtolower(trim((string) $this->email));