🆙 Fixed and no bugs anymore 🆙

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);
     }
 }

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 = [

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 = [

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()

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

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

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]

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);
         });
     }
 

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(';');

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 '';
     }
 }

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);
     }

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;

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));
         }
 

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)],
         ];
     }
 

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)],
         ];
     }
 }

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)],
         ];
     }
 

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)],
         ];
     }
 }

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)],
         ];
     }
 }

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 [

Updated_Cms/app/Models/CommandLog.php

@@ -22,7 +22,6 @@ class CommandLog extends Model
     {
         return $this->belongsTo(User::class);
     }
-
     protected function casts(): array
     {
         return [

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 [

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));
     }
 }

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));
     }
 }

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 [

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 [

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) {

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'));
 

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);
 

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;

Updated_Cms/resources/themes/atom/js/app.js

@@ -1,9 +1,8 @@
 import "./bootstrap";
 import "./external/flowbite";
 
-import 'swiper/css';
+import "swiper/css";
-import 'swiper/css/pagination';
+import "swiper/css/pagination";
-
 
 import Alpine from "alpinejs";
 import Focus from "@alpinejs/focus";

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', {
+        const swipers = document.querySelectorAll('.swiper');
-            modules: [Autoplay, Pagination],
+        
-            autoplay: {
+        swipers.forEach((swiperEl) => {
-                delay: 3000,
+            new Swiper(swiperEl, {
-            },
+                modules: [Autoplay, Pagination],
-            pagination: {
+                autoplay: {
-                el: '.swiper-pagination',
+                    delay: 3000,
-            },
+                    disableOnInteraction: false,
-            // andere opties...
+                },
+                pagination: {
+                    el: '.swiper-pagination',
+                    clickable: true,
+                },
+                loop: true,
+                slidesPerView: 1,
+                spaceBetween: 30,
+            });
         });
     }
-});
+};
+
+export default AtomSliders;

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);
             }

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(),
             ],
         },
     },