From a7fef61937d66a867acebed7e32581668d44f24b Mon Sep 17 00:00:00 2001 From: Vehikl Date: Thu, 12 Jun 2025 15:44:16 -0400 Subject: [PATCH] Review changes --- .../Captcha/Schemas/{CommonSchema.php => BaseSchema.php} | 2 +- .../Captcha/Schemas/Turnstile/TurnstileSchema.php | 4 ++-- app/Filament/Server/Pages/Console.php | 7 ++----- app/Providers/Extensions/FeatureServiceProvider.php | 1 + app/Providers/Extensions/OAuthServiceProvider.php | 1 + package.json | 3 +-- 6 files changed, 8 insertions(+), 10 deletions(-) rename app/Extensions/Captcha/Schemas/{CommonSchema.php => BaseSchema.php} (98%) diff --git a/app/Extensions/Captcha/Schemas/CommonSchema.php b/app/Extensions/Captcha/Schemas/BaseSchema.php similarity index 98% rename from app/Extensions/Captcha/Schemas/CommonSchema.php rename to app/Extensions/Captcha/Schemas/BaseSchema.php index 3539a6f31..8d7d028ea 100644 --- a/app/Extensions/Captcha/Schemas/CommonSchema.php +++ b/app/Extensions/Captcha/Schemas/BaseSchema.php @@ -6,7 +6,7 @@ use Filament\Forms\Components\Component; use Filament\Forms\Components\TextInput; use Illuminate\Support\Str; -abstract class CommonSchema +abstract class BaseSchema { abstract public function getId(): string; diff --git a/app/Extensions/Captcha/Schemas/Turnstile/TurnstileSchema.php b/app/Extensions/Captcha/Schemas/Turnstile/TurnstileSchema.php index a908cd9e7..07b0280e9 100644 --- a/app/Extensions/Captcha/Schemas/Turnstile/TurnstileSchema.php +++ b/app/Extensions/Captcha/Schemas/Turnstile/TurnstileSchema.php @@ -3,7 +3,7 @@ namespace App\Extensions\Captcha\Schemas\Turnstile; use App\Extensions\Captcha\Schemas\CaptchaSchemaInterface; -use App\Extensions\Captcha\Schemas\CommonSchema; +use App\Extensions\Captcha\Schemas\BaseSchema; use Exception; use Filament\Forms\Components\Component as BaseComponent; use Filament\Forms\Components\Placeholder; @@ -11,7 +11,7 @@ use Filament\Forms\Components\Toggle; use Illuminate\Support\Facades\Http; use Illuminate\Support\HtmlString; -class TurnstileSchema extends CommonSchema implements CaptchaSchemaInterface +class TurnstileSchema extends BaseSchema implements CaptchaSchemaInterface { public function getId(): string { diff --git a/app/Filament/Server/Pages/Console.php b/app/Filament/Server/Pages/Console.php index cb8bb6339..e902a564e 100644 --- a/app/Filament/Server/Pages/Console.php +++ b/app/Filament/Server/Pages/Console.php @@ -23,8 +23,6 @@ use Filament\Widgets\Widget; use Filament\Widgets\WidgetConfiguration; use Livewire\Attributes\On; -// use App\Filament\Server\Widgets\ServerNetworkChart; - class Console extends Page { use InteractsWithActions; @@ -69,11 +67,10 @@ class Console extends Page public function mountFeature(string $data): void { $data = json_decode($data); - //$feature = data_get($data, 'key'); + $feature = data_get($data, 'key'); - $feature = 'test'; $feature = $this->featureService->get($feature); - if (/*!$feature || */ $this->getMountedAction()) { + if (!$feature || $this->getMountedAction()) { return; } $this->mountAction($feature->getId()); diff --git a/app/Providers/Extensions/FeatureServiceProvider.php b/app/Providers/Extensions/FeatureServiceProvider.php index 775545f20..abdce5524 100644 --- a/app/Providers/Extensions/FeatureServiceProvider.php +++ b/app/Providers/Extensions/FeatureServiceProvider.php @@ -17,6 +17,7 @@ class FeatureServiceProvider extends ServiceProvider $this->app->singleton(FeatureService::class, function ($app) { $provider = new FeatureService(); + // Default Feature providers $provider->register(new GSLTokenSchema()); $provider->register(new JavaVersionSchema()); $provider->register(new MinecraftEulaSchema()); diff --git a/app/Providers/Extensions/OAuthServiceProvider.php b/app/Providers/Extensions/OAuthServiceProvider.php index b021e5050..6d64ce496 100644 --- a/app/Providers/Extensions/OAuthServiceProvider.php +++ b/app/Providers/Extensions/OAuthServiceProvider.php @@ -17,6 +17,7 @@ class OAuthServiceProvider extends ServiceProvider { $this->app->singleton(OAuthService::class, function ($app) { $service = new OAuthService(); + // Default OAuth providers included with Socialite $service->register(new CommonSchema('facebook', icon: 'tabler-brand-facebook-f', hexColor: '#1877f2')); $service->register(new CommonSchema('x', icon: 'tabler-brand-x-f', hexColor: '#1da1f2')); diff --git a/package.json b/package.json index 13053bf2c..e4cbee185 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,5 @@ "prettier": "^3.4.2", "tailwindcss": "^3.4.13", "vite": "^6.0" - }, - "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" + } }