From cf1ab2afea45c6ef6087b0c9c1e1516515ae7739 Mon Sep 17 00:00:00 2001 From: K Muller Date: Mon, 17 Nov 2025 09:10:33 +0100 Subject: [PATCH] fix: :bug: add k8s package, and add new webp format in news image validation --- .../Requests/Back/News/StoreNewsRequest.php | 2 +- bootstrap/providers.php | 1 + composer.json | 1 + composer.lock | 63 ++++++++++++++++++- config/logging.php | 17 +++++ resources/ts/back/Pages/News/Form.tsx | 2 +- vite.config.ts | 2 +- 7 files changed, 84 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/Back/News/StoreNewsRequest.php b/app/Http/Requests/Back/News/StoreNewsRequest.php index b3e1cf18..8ac70568 100644 --- a/app/Http/Requests/Back/News/StoreNewsRequest.php +++ b/app/Http/Requests/Back/News/StoreNewsRequest.php @@ -43,7 +43,7 @@ class StoreNewsRequest extends FormRequest 'seo_description' => 'required|string|between:3,255', 'title' => 'required|string|between:3,255', 'slug' => 'required|string|between:3,255', - 'picture' => $this->pictureRules("nullable|file|mimes:jpg,jpeg,png|max:5120|dimensions:width=525,height=295"), + 'picture' => $this->pictureRules("nullable|file|mimes:jpg,jpeg,png,webp|max:5120|dimensions:width=525,height=295"), 'picture_alt' => 'nullable|string|between:3,60', 'picture_title' => 'nullable|string|between:3,60', 'content' => 'required|string', diff --git a/bootstrap/providers.php b/bootstrap/providers.php index fe66f616..c12444d0 100644 --- a/bootstrap/providers.php +++ b/bootstrap/providers.php @@ -6,4 +6,5 @@ return [ Uwil\LaravelBackend\Providers\TranslationServiceProvider::class, App\Providers\CrmApiServiceProvider::class, App\Providers\DynamicPageRouteServiceProvider::class, + Uwil\K8S\Laravel\K8SServiceProvider::class, ]; diff --git a/composer.json b/composer.json index ea15f152..7cf6abf9 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,7 @@ "sentry/sentry-laravel": "^4.18", "spatie/laravel-translatable": "^6.11", "tightenco/ziggy": "^2.5", + "uwil/k8s-laravel": "^2.0", "uwil/laravel-backend": "^3.0", "uwil/laravel-common": "^4.1" }, diff --git a/composer.lock b/composer.lock index a5e10590..7296f84a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "549616846253f32358b71b44ee108831", + "content-hash": "f9cb87942c7b3c93516b54b61c4bf66d", "packages": [ { "name": "24slides/laravel-saml2", @@ -7531,6 +7531,67 @@ }, "time": "2024-12-21T16:25:41+00:00" }, + { + "name": "uwil/k8s-laravel", + "version": "2.0.0", + "source": { + "type": "git", + "url": "git@lab.s-web.fr:ldc-web/projets/k8s-laravel.git", + "reference": "050fb59ac50ed676661cca2a44050f116ef996fb" + }, + "dist": { + "type": "zip", + "url": "https://lab.s-web.fr/api/v4/projects/90/packages/composer/archives/uwil/k8s-laravel.zip?sha=050fb59ac50ed676661cca2a44050f116ef996fb", + "reference": "050fb59ac50ed676661cca2a44050f116ef996fb", + "shasum": "" + }, + "require": { + "illuminate/support": "~8|~9|~10|~11|~12", + "laravel/framework": "~8|~9|~10|~11|~12", + "php": "~7.3|~7.4|~8" + }, + "require-dev": { + "orchestra/testbench": "^8.5", + "phpunit/php-code-coverage": "^9.2", + "phpunit/phpunit": "^9.6", + "slevomat/coding-standard": "^8.3", + "squizlabs/php_codesniffer": "^3.7" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Uwil\\K8S\\Laravel\\K8SServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Uwil\\K8S\\Laravel\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Uwil\\K8S\\Laravel\\Tests\\": "tests" + } + }, + "scripts": { + "test": [ + "vendor/bin/phpunit" + ], + "post-autoload-dump": [ + "@php ./vendor/bin/testbench package:discover --ansi" + ] + }, + "license": [ + "MIT" + ], + "description": "Laravel requirements for k8s", + "support": { + "email": "equipe.web@ldc.fr", + "issues": "https://lab.s-web.fr/ldc-web/projets/k8s-laravel/-/issues" + } + }, { "name": "uwil/laravel-activity-logs", "version": "4.0.1", diff --git a/config/logging.php b/config/logging.php index bb81f0d3..b6d11541 100644 --- a/config/logging.php +++ b/config/logging.php @@ -7,6 +7,23 @@ use Monolog\Processor\PsrLogMessageProcessor; return [ + 'stdout' => [ + 'driver' => 'monolog', + 'level' => env('LOG_LEVEL', 'debug'), + 'handler' => StreamHandler::class, + 'formatter' => env('LOG_STDOUT_FORMATTER'), + 'with' => [ + 'stream' => 'php://stdout', + ], + ], + + 'k8s' => [ + 'driver' => 'stack', + 'channels' => ['daily', 'stdout'], + 'ignore_exceptions' => false, + ], + + /** *-------------------------------------------------------------------------- * Default Log Channel diff --git a/resources/ts/back/Pages/News/Form.tsx b/resources/ts/back/Pages/News/Form.tsx index 3b52c038..54bbf992 100644 --- a/resources/ts/back/Pages/News/Form.tsx +++ b/resources/ts/back/Pages/News/Form.tsx @@ -293,7 +293,7 @@ export default function Form({ value={data.picture} required={true} maxFileSize={"5120"} - allowedFormats={"jpg,jpeg,png"} + allowedFormats={"jpg,jpeg,png,webp"} validationRules={{ width: "525", height: "295" diff --git a/vite.config.ts b/vite.config.ts index f87c045a..e481b949 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -7,7 +7,7 @@ import eslint from 'vite-plugin-eslint'; import stylelint from "vite-plugin-stylelint"; const env = loadEnv("r", process.cwd(), ""); -const debugMode = env["APP_DEBUG"] === "false"; +const debugMode = env["APP_DEBUG"] === "true"; export default defineConfig({ plugins: [