Merge branch 'develop' into trunk

This commit is contained in:
K Muller 2025-11-17 09:12:32 +01:00
commit a080552f3f
7 changed files with 84 additions and 4 deletions

View file

@ -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',

View file

@ -6,4 +6,5 @@ return [
Uwil\LaravelBackend\Providers\TranslationServiceProvider::class,
App\Providers\CrmApiServiceProvider::class,
App\Providers\DynamicPageRouteServiceProvider::class,
Uwil\K8S\Laravel\K8SServiceProvider::class,
];

View file

@ -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"
},

63
composer.lock generated
View file

@ -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",

View file

@ -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

View file

@ -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"

View file

@ -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: [