From 65ea6c167f2e387e079140ef1b00e738787ceb28 Mon Sep 17 00:00:00 2001 From: Remco Date: Wed, 7 Jan 2026 20:01:53 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=86=99=20Fixed=20and=20no=20bugs=20anymor?= =?UTF-8?q?e=20=F0=9F=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...woFactorAuthenticatedSessionController.php | 2 +- .../app/Actions/Fortify/CreateNewUser.php | 2 +- .../RedirectIfTwoFactorAuthenticatable.php | 3 +- Updated_Cms/app/Filament/Pages/BadgePage.php | 4 +-- Updated_Cms/app/Filament/Pages/Login.php | 2 +- .../BadgeTextEditorResource.php | 2 +- .../Resources/Hotel/CustomQueryBuilder.php | 2 +- .../Resources/User/Users/Pages/EditUser.php | 4 +-- .../BadgesRelationManager.php | 4 +-- Updated_Cms/app/Helpers/helper.php | 11 +++---- .../Http/Controllers/Shop/ShopController.php | 2 +- .../User/ForgotPasswordController.php | 1 + .../Middleware/LocalizationMiddleware.php | 7 ++-- .../Requests/AccountSettingsFormRequest.php | 2 +- .../Requests/PasswordSettingsFormRequest.php | 2 +- .../app/Http/Requests/RegisterFormRequest.php | 2 +- .../Http/Requests/ShopVoucherFormRequest.php | 2 +- .../Requests/StaffApplicationFormRequest.php | 2 +- Updated_Cms/app/Models/Article.php | 1 - Updated_Cms/app/Models/CommandLog.php | 1 - .../Community/Staff/WebsiteOpenPosition.php | 1 - .../Models/Help/WebsiteHelpCenterTicket.php | 2 +- .../Help/WebsiteHelpCenterTicketReply.php | 2 +- .../app/Models/Miscellaneous/CameraWeb.php | 2 +- Updated_Cms/app/Models/PasswordResetToken.php | 1 - Updated_Cms/app/Models/User.php | 2 +- Updated_Cms/app/Models/WebsiteAd.php | 5 ++- .../app/Providers/AppServiceProvider.php | 2 +- .../app/Services/User/SessionService.php | 1 + Updated_Cms/rector.php | 4 +-- Updated_Cms/resources/themes/atom/js/app.js | 5 ++- .../themes/atom/js/components/AtomSliders.js | 32 ++++++++++++------- .../resources/themes/atom/vite.config.js | 1 - Updated_Cms/vite.config.js | 8 +---- 34 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Updated_Cms/app/Actions/Fortify/Controllers/TwoFactorAuthenticatedSessionController.php b/Updated_Cms/app/Actions/Fortify/Controllers/TwoFactorAuthenticatedSessionController.php index 0eb19224e2..86beeb01ea 100644 --- a/Updated_Cms/app/Actions/Fortify/Controllers/TwoFactorAuthenticatedSessionController.php +++ b/Updated_Cms/app/Actions/Fortify/Controllers/TwoFactorAuthenticatedSessionController.php @@ -53,6 +53,6 @@ class TwoFactorAuthenticatedSessionController extends Controller 'ip_current' => $request->ip(), ]); - return resolve(TwoFactorLoginResponse::class); + return app(TwoFactorLoginResponse::class); } } diff --git a/Updated_Cms/app/Actions/Fortify/CreateNewUser.php b/Updated_Cms/app/Actions/Fortify/CreateNewUser.php index 18e299393f..2fd1909ad1 100644 --- a/Updated_Cms/app/Actions/Fortify/CreateNewUser.php +++ b/Updated_Cms/app/Actions/Fortify/CreateNewUser.php @@ -120,7 +120,7 @@ class CreateNewUser implements CreatesNewUsers 'beta_code' => ['sometimes', 'string', new BetaCodeRule], 'terms' => ['required', 'accepted'], 'g-recaptcha-response' => ['sometimes', 'string', new GoogleRecaptchaRule], - 'cf-turnstile-response' => [resolve(Turnstile::class)], + 'cf-turnstile-response' => [app(Turnstile::class)], ]; $messages = [ diff --git a/Updated_Cms/app/Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php b/Updated_Cms/app/Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php index 91ef878738..17837dd031 100644 --- a/Updated_Cms/app/Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php +++ b/Updated_Cms/app/Actions/Fortify/RedirectIfTwoFactorAuthenticatable.php @@ -11,6 +11,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\ValidationException; +use Laravel\Fortify\Events\TwoFactorAuthenticationChallenged; use Laravel\Fortify\Fortify; use Laravel\Fortify\LoginRateLimiter; use Laravel\Fortify\TwoFactorAuthenticatable; @@ -179,7 +180,7 @@ class RedirectIfTwoFactorAuthenticatable } if (setting('cloudflare_turnstile_enabled') !== '' && setting('cloudflare_turnstile_enabled') !== '0') { - $rules['cf-turnstile-response'] = ['required', resolve(Turnstile::class)]; + $rules['cf-turnstile-response'] = ['required', app(Turnstile::class)]; } $messages = [ diff --git a/Updated_Cms/app/Filament/Pages/BadgePage.php b/Updated_Cms/app/Filament/Pages/BadgePage.php index 6cbf056533..9619683800 100644 --- a/Updated_Cms/app/Filament/Pages/BadgePage.php +++ b/Updated_Cms/app/Filament/Pages/BadgePage.php @@ -123,7 +123,7 @@ class BadgePage extends Page return; } - $badgeData = resolve(ExternalTextsParser::class)->getBadgeData($badgeCode); + $badgeData = app(ExternalTextsParser::class)->getBadgeData($badgeCode); $this->badgeWasPreviouslyCreated = is_array($badgeData['nitro']) || is_array($badgeData['flash']); if ($this->badgeWasPreviouslyCreated) { @@ -202,7 +202,7 @@ class BadgePage extends Page return; } - $externalTextsParser = resolve(ExternalTextsParser::class); + $externalTextsParser = app(ExternalTextsParser::class); if ((empty($this->data['nitro']) && $nitroEnabled) || (empty($this->data['flash']) && $flashEnabled)) { Notification::make() diff --git a/Updated_Cms/app/Filament/Pages/Login.php b/Updated_Cms/app/Filament/Pages/Login.php index a9afbfaa09..d3e02bdf06 100644 --- a/Updated_Cms/app/Filament/Pages/Login.php +++ b/Updated_Cms/app/Filament/Pages/Login.php @@ -56,7 +56,7 @@ class Login extends \Filament\Auth\Pages\Login session()->regenerate(); - return resolve(LoginResponse::class); + return app(LoginResponse::class); } protected function throwFailureValidationException(): never diff --git a/Updated_Cms/app/Filament/Resources/Hotel/BadgeTextEditors/BadgeTextEditorResource.php b/Updated_Cms/app/Filament/Resources/Hotel/BadgeTextEditors/BadgeTextEditorResource.php index 4b19d5de52..5b97b1a9ea 100644 --- a/Updated_Cms/app/Filament/Resources/Hotel/BadgeTextEditors/BadgeTextEditorResource.php +++ b/Updated_Cms/app/Filament/Resources/Hotel/BadgeTextEditors/BadgeTextEditorResource.php @@ -55,7 +55,7 @@ class BadgeTextEditorResource extends Resource #[\Override] public static function table(Table $table): Table { - $settingsService = resolve(SettingsService::class); + $settingsService = app(SettingsService::class); $badgesPath = $settingsService->getOrDefault('badges_path', '/gamedata/c_images/album1584/'); return $table diff --git a/Updated_Cms/app/Filament/Resources/Hotel/CustomQueryBuilder.php b/Updated_Cms/app/Filament/Resources/Hotel/CustomQueryBuilder.php index dea4526a41..d86c8abb6d 100644 --- a/Updated_Cms/app/Filament/Resources/Hotel/CustomQueryBuilder.php +++ b/Updated_Cms/app/Filament/Resources/Hotel/CustomQueryBuilder.php @@ -10,7 +10,7 @@ class CustomQueryBuilder extends Builder public function __construct() { // Call the parent constructor with a dummy query - parent::__construct(resolve('db')->query()); + parent::__construct(app('db')->query()); } #[\Override] diff --git a/Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php b/Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php index 03eb35a51c..ba5baa061f 100644 --- a/Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php +++ b/Updated_Cms/app/Filament/Resources/User/Users/Pages/EditUser.php @@ -58,7 +58,7 @@ class EditUser extends EditRecord $this->halt(); } - $rcon = resolve(RconService::class); + $rcon = app(RconService::class); if (! $user->online) { DB::transaction(function () use ($user, $data): void { @@ -152,7 +152,7 @@ class EditUser extends EditRecord return; } - resolve(SendCurrency::class)->execute($user, $currencyType, -$currency->amount + $updatedCurrencyAmount); + app(SendCurrency::class)->execute($user, $currencyType, -$currency->amount + $updatedCurrencyAmount); }); } diff --git a/Updated_Cms/app/Filament/Resources/User/Users/RelationManagers/BadgesRelationManager.php b/Updated_Cms/app/Filament/Resources/User/Users/RelationManagers/BadgesRelationManager.php index 04f37813ad..312bc5ca91 100644 --- a/Updated_Cms/app/Filament/Resources/User/Users/RelationManagers/BadgesRelationManager.php +++ b/Updated_Cms/app/Filament/Resources/User/Users/RelationManagers/BadgesRelationManager.php @@ -83,7 +83,7 @@ class BadgesRelationManager extends RelationManager ->persistent() ->send(); } else { - $rcon = resolve(RconService::class); + $rcon = app(RconService::class); $data = $action->getFormData(); $rcon->sendSafelyFromDashboard('sendBadge', [$user, $data['badge_code']], 'RCON: Failed to send the badge'); @@ -119,7 +119,7 @@ class BadgesRelationManager extends RelationManager ->persistent() ->send(); } else { - $rcon = resolve(RconService::class); + $rcon = app(RconService::class); $badge = $action instanceof DeleteAction ? $action->getRecord()?->badge_code : $action->getRecords()->map(fn ($record) => $record->badge_code)->join(';'); diff --git a/Updated_Cms/app/Helpers/helper.php b/Updated_Cms/app/Helpers/helper.php index 63cae2a79b..19eafa0662 100644 --- a/Updated_Cms/app/Helpers/helper.php +++ b/Updated_Cms/app/Helpers/helper.php @@ -3,27 +3,27 @@ use App\Services\HousekeepingPermissionsService; use App\Services\PermissionsService; use App\Services\SettingsService; -use Illuminate\Support\Facades\Schema; use Illuminate\Support\Str; +use Illuminate\Support\Facades\Schema; if (! function_exists('setting')) { function setting(string $setting): string { - return resolve(SettingsService::class)->getOrDefault($setting); + return app(SettingsService::class)->getOrDefault($setting); } } if (! function_exists('hasPermission')) { function hasPermission(string $permission): string { - return resolve(PermissionsService::class)->getOrDefault($permission); + return app(PermissionsService::class)->getOrDefault($permission); } } if (! function_exists('hasHousekeepingPermission')) { function hasHousekeepingPermission(string $permission): string { - return resolve(HousekeepingPermissionsService::class)->getOrDefault($permission); + return app(HousekeepingPermissionsService::class)->getOrDefault($permission); } } @@ -43,7 +43,6 @@ if (! function_exists('findMigration')) { return basename($filename); } } - return ''; } } @@ -74,4 +73,4 @@ if (! function_exists('dropForeignKeyIfExists')) { } } } -} +} \ No newline at end of file diff --git a/Updated_Cms/app/Http/Controllers/Shop/ShopController.php b/Updated_Cms/app/Http/Controllers/Shop/ShopController.php index 86b97dee50..9d0c518ec5 100644 --- a/Updated_Cms/app/Http/Controllers/Shop/ShopController.php +++ b/Updated_Cms/app/Http/Controllers/Shop/ShopController.php @@ -135,7 +135,7 @@ class ShopController extends Controller public function handleFurniture(array $furniture) { - $sendFurniture = resolve(SendFurniture::class); + $sendFurniture = app(SendFurniture::class); $sendFurniture->execute(Auth::user(), $furniture); } diff --git a/Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php b/Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php index 8f41c6981c..098f900eb3 100644 --- a/Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php +++ b/Updated_Cms/app/Http/Controllers/User/ForgotPasswordController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\User; use App\Http\Controllers\Controller; use App\Models\PasswordResetToken; use App\Models\User; +use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Str; use Mail; diff --git a/Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php b/Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php index 07571b7b2f..66e89a30ac 100644 --- a/Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php +++ b/Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php @@ -24,9 +24,10 @@ class LocalizationMiddleware $countryCode = config('habbo.site.default_language'); // GEWIJZIGD: isset() werkt niet op Request::server() in PHP 8. Gebruik null !== in plaats daarvan. - if (\Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY') !== null) { + if (null !== \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY')) { $countryCode = strtolower((string) \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY')); - } elseif (\Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE') !== null) { + } + elseif (null !== \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE')) { $countryCode = strtolower(substr((string) \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE'), 0, 2)); } @@ -46,4 +47,4 @@ class LocalizationMiddleware return $next($request); } -} +} \ No newline at end of file diff --git a/Updated_Cms/app/Http/Requests/AccountSettingsFormRequest.php b/Updated_Cms/app/Http/Requests/AccountSettingsFormRequest.php index c557ce9954..a5abff49cd 100644 --- a/Updated_Cms/app/Http/Requests/AccountSettingsFormRequest.php +++ b/Updated_Cms/app/Http/Requests/AccountSettingsFormRequest.php @@ -17,7 +17,7 @@ class AccountSettingsFormRequest extends FormRequest 'mail' => ['required', 'email', Rule::unique('users')->ignore($this->user()->id), new WebsiteWordfilterRule], 'motto' => ['nullable', 'string', 'max:127', new WebsiteWordfilterRule], 'g-recaptcha-response' => [new GoogleRecaptchaRule], - 'cf-turnstile-response' => [resolve(Turnstile::class)], + 'cf-turnstile-response' => [app(Turnstile::class)], ]; } diff --git a/Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php b/Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php index 69ec1ba700..c57356df18 100644 --- a/Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php +++ b/Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php @@ -18,7 +18,7 @@ class PasswordSettingsFormRequest extends FormRequest 'current_password' => ['required', 'string', new CurrentPasswordRule], 'password' => $this->passwordRules(), 'g-recaptcha-response' => [new GoogleRecaptchaRule], - 'cf-turnstile-response' => [resolve(Turnstile::class)], + 'cf-turnstile-response' => [app(Turnstile::class)], ]; } } diff --git a/Updated_Cms/app/Http/Requests/RegisterFormRequest.php b/Updated_Cms/app/Http/Requests/RegisterFormRequest.php index 4804eecb27..1dae173c81 100644 --- a/Updated_Cms/app/Http/Requests/RegisterFormRequest.php +++ b/Updated_Cms/app/Http/Requests/RegisterFormRequest.php @@ -18,7 +18,7 @@ class RegisterFormRequest extends FormRequest 'password' => ['required', 'string', 'confirmed', 'min:8'], 'terms' => ['required', 'accepted'], 'g-recaptcha-response' => [new GoogleRecaptchaRule], - 'cf-turnstile-response' => [resolve(Turnstile::class)], + 'cf-turnstile-response' => [app(Turnstile::class)], ]; } diff --git a/Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php b/Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php index fb56a9c3f2..179d67700e 100644 --- a/Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php +++ b/Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php @@ -13,7 +13,7 @@ class ShopVoucherFormRequest extends FormRequest return [ 'code' => ['required', 'string'], 'g-recaptcha-response' => [new GoogleRecaptchaRule], - 'cf-turnstile-response' => [resolve(Turnstile::class)], + 'cf-turnstile-response' => [app(Turnstile::class)], ]; } } diff --git a/Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php b/Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php index 97b7cea0cd..c5c1a80d96 100644 --- a/Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php +++ b/Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php @@ -13,7 +13,7 @@ class StaffApplicationFormRequest extends FormRequest return [ 'content' => ['required', 'string'], 'g-recaptcha-response' => [new GoogleRecaptchaRule], - 'cf-turnstile-response' => [resolve(Turnstile::class)], + 'cf-turnstile-response' => [app(Turnstile::class)], ]; } } diff --git a/Updated_Cms/app/Models/Article.php b/Updated_Cms/app/Models/Article.php index 39edfef0f1..85d29c6a56 100644 --- a/Updated_Cms/app/Models/Article.php +++ b/Updated_Cms/app/Models/Article.php @@ -134,7 +134,6 @@ class Article extends Model ->each(fn (AuthorNotification $follower) => $follower->user->notify($this->user, NotificationType::ArticlePosted, $this->getNotificationUrl()), ); } - protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/CommandLog.php b/Updated_Cms/app/Models/CommandLog.php index 0e9866f79f..80373b49b3 100644 --- a/Updated_Cms/app/Models/CommandLog.php +++ b/Updated_Cms/app/Models/CommandLog.php @@ -22,7 +22,6 @@ class CommandLog extends Model { return $this->belongsTo(User::class); } - protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/Community/Staff/WebsiteOpenPosition.php b/Updated_Cms/app/Models/Community/Staff/WebsiteOpenPosition.php index 41af0f8a86..873cd21123 100644 --- a/Updated_Cms/app/Models/Community/Staff/WebsiteOpenPosition.php +++ b/Updated_Cms/app/Models/Community/Staff/WebsiteOpenPosition.php @@ -45,7 +45,6 @@ class WebsiteOpenPosition extends Model { return $query->where('apply_from', '<=', now())->where('apply_to', '>', now()); } - protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php index 40461e3cac..bc6e793b87 100644 --- a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php +++ b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicket.php @@ -52,6 +52,6 @@ class WebsiteHelpCenterTicket extends Model protected function content(): \Illuminate\Database\Eloquent\Casts\Attribute { - return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: fn ($value) => Purify::clean($value)); + return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: fn($value) => Purify::clean($value)); } } diff --git a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php index 5a8a32dad3..61cedf8cff 100644 --- a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php +++ b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php @@ -29,6 +29,6 @@ class WebsiteHelpCenterTicketReply extends Model protected function content(): \Illuminate\Database\Eloquent\Casts\Attribute { - return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: fn ($value) => Purify::clean($value)); + return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: fn($value) => Purify::clean($value)); } } diff --git a/Updated_Cms/app/Models/Miscellaneous/CameraWeb.php b/Updated_Cms/app/Models/Miscellaneous/CameraWeb.php index 30717c6f11..8545804f39 100644 --- a/Updated_Cms/app/Models/Miscellaneous/CameraWeb.php +++ b/Updated_Cms/app/Models/Miscellaneous/CameraWeb.php @@ -4,6 +4,7 @@ namespace App\Models\Miscellaneous; use App\Models\Room; use App\Models\User; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; @@ -60,7 +61,6 @@ class CameraWeb extends Model get: fn () => \Illuminate\Support\Facades\Date::parse($this->timestamp)->format('Y-m-d H:i'), ); } - protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/PasswordResetToken.php b/Updated_Cms/app/Models/PasswordResetToken.php index 5f787dcfed..790babcef6 100644 --- a/Updated_Cms/app/Models/PasswordResetToken.php +++ b/Updated_Cms/app/Models/PasswordResetToken.php @@ -18,7 +18,6 @@ class PasswordResetToken extends Model { return $this->belongsTo(User::class, 'email', 'mail'); } - protected function casts(): array { return [ diff --git a/Updated_Cms/app/Models/User.php b/Updated_Cms/app/Models/User.php index 542f08ff2e..7fdfaa28eb 100644 --- a/Updated_Cms/app/Models/User.php +++ b/Updated_Cms/app/Models/User.php @@ -245,7 +245,7 @@ class User extends Authenticatable implements FilamentUser, HasName public function confirmTwoFactorAuthentication($code) { - $codeIsValid = resolve(TwoFactorAuthenticationProvider::class) + $codeIsValid = app(TwoFactorAuthenticationProvider::class) ->verify(decrypt($this->two_factor_secret), $code); if (! $codeIsValid) { diff --git a/Updated_Cms/app/Models/WebsiteAd.php b/Updated_Cms/app/Models/WebsiteAd.php index 331a918866..9d7c49f724 100644 --- a/Updated_Cms/app/Models/WebsiteAd.php +++ b/Updated_Cms/app/Models/WebsiteAd.php @@ -20,12 +20,11 @@ class WebsiteAd extends Model protected function imageUrl(): \Illuminate\Database\Eloquent\Casts\Attribute { return \Illuminate\Database\Eloquent\Casts\Attribute::make(get: function () { - $settingsService = resolve(SettingsService::class); + $settingsService = app(SettingsService::class); $adsPicturePath = Cache::remember('ads_picture_path', 3600, fn () => $settingsService->getOrDefault('ads_picture_path')); if (! str_starts_with((string) $adsPicturePath, 'http')) { $adsPicturePath = rtrim((string) config('app.url'), '/') . '/' . ltrim((string) $adsPicturePath, '/'); } - return rtrim((string) $adsPicturePath, '/') . '/' . $this->image; }); } @@ -56,7 +55,7 @@ class WebsiteAd extends Model protected function configureAdsDisk(): void { - $settingsService = resolve(SettingsService::class); + $settingsService = app(SettingsService::class); $adsPath = Cache::remember('ads_path_filesystem', 3600, fn () => $settingsService->getOrDefault('ads_path_filesystem')); diff --git a/Updated_Cms/app/Providers/AppServiceProvider.php b/Updated_Cms/app/Providers/AppServiceProvider.php index 4da8171f7b..d101747efd 100644 --- a/Updated_Cms/app/Providers/AppServiceProvider.php +++ b/Updated_Cms/app/Providers/AppServiceProvider.php @@ -56,7 +56,7 @@ class AppServiceProvider extends ServiceProvider $table->paginated([10, 25, 50]); }); - $settingsService = resolve(SettingsService::class); + $settingsService = app(SettingsService::class); $badgePath = $settingsService->getOrDefault('badge_path_filesystem', '/var/www/gamedata/c_images/album1584'); Config::set('filesystems.disks.badges.root', $badgePath); diff --git a/Updated_Cms/app/Services/User/SessionService.php b/Updated_Cms/app/Services/User/SessionService.php index fe5153ceaa..9058fc56ee 100644 --- a/Updated_Cms/app/Services/User/SessionService.php +++ b/Updated_Cms/app/Services/User/SessionService.php @@ -2,6 +2,7 @@ namespace App\Services\User; +use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; diff --git a/Updated_Cms/rector.php b/Updated_Cms/rector.php index be40331b0e..8632e6971a 100644 --- a/Updated_Cms/rector.php +++ b/Updated_Cms/rector.php @@ -22,7 +22,7 @@ return RectorConfig::configure() ->withSets([ LevelSetList::UP_TO_PHP_85, // Dit activeert de gratis "Laravel Shift" naar versie 12: - LaravelLevelSetList::UP_TO_LARAVEL_120, + LaravelLevelSetList::UP_TO_LARAVEL_120, LaravelSetList::LARAVEL_CODE_QUALITY, SetList::CODE_QUALITY, SetList::DEAD_CODE, @@ -30,4 +30,4 @@ return RectorConfig::configure() ->withSkip([ __DIR__ . '/lang/vendor', __DIR__ . '/storage', // Altijd overslaan - ]); + ]); \ No newline at end of file diff --git a/Updated_Cms/resources/themes/atom/js/app.js b/Updated_Cms/resources/themes/atom/js/app.js index f801092e08..77f5439001 100644 --- a/Updated_Cms/resources/themes/atom/js/app.js +++ b/Updated_Cms/resources/themes/atom/js/app.js @@ -1,9 +1,8 @@ import "./bootstrap"; import "./external/flowbite"; -import 'swiper/css'; -import 'swiper/css/pagination'; - +import "swiper/css"; +import "swiper/css/pagination"; import Alpine from "alpinejs"; import Focus from "@alpinejs/focus"; diff --git a/Updated_Cms/resources/themes/atom/js/components/AtomSliders.js b/Updated_Cms/resources/themes/atom/js/components/AtomSliders.js index 5df8debed2..1a2d736ba8 100644 --- a/Updated_Cms/resources/themes/atom/js/components/AtomSliders.js +++ b/Updated_Cms/resources/themes/atom/js/components/AtomSliders.js @@ -1,17 +1,27 @@ import Swiper from 'swiper'; import { Autoplay, Pagination } from 'swiper/modules'; -export default () => ({ +const AtomSliders = { init() { - const swiper = new Swiper('.swiper', { - modules: [Autoplay, Pagination], - autoplay: { - delay: 3000, - }, - pagination: { - el: '.swiper-pagination', - }, - // andere opties... + const swipers = document.querySelectorAll('.swiper'); + + swipers.forEach((swiperEl) => { + new Swiper(swiperEl, { + modules: [Autoplay, Pagination], + autoplay: { + delay: 3000, + disableOnInteraction: false, + }, + pagination: { + el: '.swiper-pagination', + clickable: true, + }, + loop: true, + slidesPerView: 1, + spaceBetween: 30, + }); }); } -}); +}; + +export default AtomSliders; diff --git a/Updated_Cms/resources/themes/atom/vite.config.js b/Updated_Cms/resources/themes/atom/vite.config.js index c0372e4323..c9ccc01f36 100644 --- a/Updated_Cms/resources/themes/atom/vite.config.js +++ b/Updated_Cms/resources/themes/atom/vite.config.js @@ -49,7 +49,6 @@ export default defineConfig({ build: { rollupOptions: { onwarn(warning, warn) { - // Negeer INVALID_ANNOTATION warnings van flowbite if (warning.code === 'INVALID_ANNOTATION') return; warn(warning); } diff --git a/Updated_Cms/vite.config.js b/Updated_Cms/vite.config.js index a06e19a771..060f63eb50 100644 --- a/Updated_Cms/vite.config.js +++ b/Updated_Cms/vite.config.js @@ -2,10 +2,6 @@ import { defineConfig } from "vite"; import laravel from "laravel-vite-plugin"; import path from "path"; import tailwindcss from "tailwindcss"; -import postcssImport from "postcss-import"; -import postcssNesting from "postcss-nesting"; -import tailwindcssNesting from "tailwindcss/nesting"; -import autoprefixer from "autoprefixer"; export default defineConfig({ plugins: [ @@ -15,6 +11,7 @@ export default defineConfig({ "resources/js/global.js", ], }), + { name: "blade", handleHotUpdate({ file, server }) { @@ -35,12 +32,9 @@ export default defineConfig({ css: { postcss: { plugins: [ - postcssImport(), - tailwindcssNesting(postcssNesting()), tailwindcss({ config: path.resolve(__dirname, "tailwind.config.js"), }), - autoprefixer(), ], }, },