Merge branch 'develop' into trunk
This commit is contained in:
commit
8ff67da99d
8 changed files with 1279 additions and 47 deletions
2
.husky/commit-msg
Normal file
2
.husky/commit-msg
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
npx commitlint --config node_modules/@uwil/husky-config/commitlint.config.js --edit $1
|
||||
1
commitlint.config.js
Normal file
1
commitlint.config.js
Normal file
|
|
@ -0,0 +1 @@
|
|||
export default { extends: ["@uwil/husky-config/commitlint.config.js"] };
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
"spatie/laravel-translatable": "^6.4",
|
||||
"uwil/admin-secure-laravel": "^5.0",
|
||||
"uwil/k8s-laravel": "^2.0.0",
|
||||
"uwil/laravel-common": "^3.4.1",
|
||||
"uwil/laravel-common": "^4.1.6",
|
||||
"uwil/schema-org-laravel": "^2.2.0",
|
||||
"uwil/seo-laravel": "^4.0.0",
|
||||
"uwil/sitemap-generator": "^5.0.1"
|
||||
|
|
|
|||
12
composer.lock
generated
12
composer.lock
generated
|
|
@ -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": "3ceb9399af2a80b348e5aba0a241f6a7",
|
||||
"content-hash": "e8975a9971502697de738f58f1964184",
|
||||
"packages": [
|
||||
{
|
||||
"name": "bacon/bacon-qr-code",
|
||||
|
|
@ -8362,16 +8362,16 @@
|
|||
},
|
||||
{
|
||||
"name": "uwil/laravel-common",
|
||||
"version": "3.4.3",
|
||||
"version": "4.1.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "git@lab.s-web.fr:ldc-web/projets/laravel-common.git",
|
||||
"reference": "e4d69be567729f0e32379b4ed1ed8cd0dc3746df"
|
||||
"reference": "3fb5b3b1e1cff39885ccfd98ba1b4be1cd15b18e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://lab.s-web.fr/api/v4/projects/215/packages/composer/archives/uwil/laravel-common.zip?sha=e4d69be567729f0e32379b4ed1ed8cd0dc3746df",
|
||||
"reference": "e4d69be567729f0e32379b4ed1ed8cd0dc3746df",
|
||||
"url": "https://lab.s-web.fr/api/v4/projects/215/packages/composer/archives/uwil/laravel-common.zip?sha=3fb5b3b1e1cff39885ccfd98ba1b4be1cd15b18e",
|
||||
"reference": "3fb5b3b1e1cff39885ccfd98ba1b4be1cd15b18e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -8379,7 +8379,7 @@
|
|||
"kwaadpepper/image-resizer": "^3.0",
|
||||
"laravel/framework": "~11|~12",
|
||||
"mews/purifier": "^3.4",
|
||||
"php": "~8.3",
|
||||
"php": "^8.3",
|
||||
"sentry/sentry-laravel": "^4.10"
|
||||
},
|
||||
"require-dev": {
|
||||
|
|
|
|||
1286
package-lock.json
generated
1286
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -30,6 +30,7 @@
|
|||
"@types/webpack-env": "^1.18.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.36.2",
|
||||
"@typescript-eslint/parser": "^5.36.2",
|
||||
"@uwil/husky-config": "^1.1.1",
|
||||
"@vitejs/plugin-legacy": "^4.0.1",
|
||||
"@vitejs/plugin-vue": "^4.0.0",
|
||||
"@vue/eslint-config-typescript": "^11.0.0",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@
|
|||
|
||||
<x-uwil-common::head.favicon mask-icon-color="#5bbad5" tile-color="#da532c" theme-color="#ffffff" />
|
||||
<x-uwil-common::head.robots />
|
||||
<x-uwil-common::head.hreflang />
|
||||
@if (request()->route())
|
||||
<x-uwil-common::head.hreflang />
|
||||
@endif
|
||||
<x-uwil-common::head.canonical />
|
||||
<x-uwil-common::head.og />
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
@hasSection('breadcrumb')
|
||||
@if (Breadcrumbs::exists(app()->view->getSections()['breadcrumb']))
|
||||
{{ call_user_func_array(
|
||||
'Breadcrumbs::view',
|
||||
array_merge(['breadcrumbs::json-ld', app()->view->getSections()['breadcrumb']], Arr::wrap($brParam)),
|
||||
) }}
|
||||
@if (request()->route())
|
||||
@hasSection('breadcrumb')
|
||||
@if (Breadcrumbs::exists(app()->view->getSections()['breadcrumb']))
|
||||
{{ call_user_func_array(
|
||||
'Breadcrumbs::view',
|
||||
array_merge(['breadcrumbs::json-ld', app()->view->getSections()['breadcrumb']], Arr::wrap($brParam)),
|
||||
) }}
|
||||
@endif
|
||||
@elseif(Breadcrumbs::exists(request()->route()->getName()))
|
||||
{{ Breadcrumbs::view('breadcrumbs::json-ld', request()->route()->getName()) }}
|
||||
@endif
|
||||
@elseif(Breadcrumbs::exists(request()->route()->getName()))
|
||||
{{ Breadcrumbs::view('breadcrumbs::json-ld', request()->route()->getName()) }}
|
||||
@endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue