forge-joniko/ldc-wenn-dann-mit-respekt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
System User 2025-07-18 16:18:31 +02:00
commit 27a6e1ac10
4 changed files with 91 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
composer.json
View file

@ -21,9 +21,10 @@
"spatie/laravel-translatable": "^6.4",
"uwil/admin-secure-laravel": "^4.0.0",
"uwil/k8s-laravel": "^2.0.0",
"uwil/laravel-common": "^3.4.1",
"uwil/schema-org-laravel": "^2.2.0",
"uwil/sitemap-generator": "^4.0.0",
"uwil/seo-laravel": "^4.0.0"
"uwil/seo-laravel": "^4.0.0",
"uwil/sitemap-generator": "^4.0.0"
},
"require-dev": {
"fakerphp/faker": "^1.9.1",

66
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": "72619fa0d878ec15109b2f831a4ae4a5",
"content-hash": "bbcd66f65e53715de8bc47355715c829",
"packages": [
{
"name": "bacon/bacon-qr-code",
@ -8216,6 +8216,70 @@
"issues": "https://lab.s-web.fr/ldc-web/projets/k8s-laravel/-/issues"
}
},
{
"name": "uwil/laravel-common",
"version": "3.4.1",
"source": {
"type": "git",
"url": "git@lab.s-web.fr:ldc-web/projets/laravel-common.git",
"reference": "3f3fef27fa789935b528960c9c50caa02326ef2e"
},
"dist": {
"type": "zip",
"url": "https://lab.s-web.fr/api/v4/projects/215/packages/composer/archives/uwil/laravel-common.zip?sha=3f3fef27fa789935b528960c9c50caa02326ef2e",
"reference": "3f3fef27fa789935b528960c9c50caa02326ef2e",
"shasum": ""
},
"require": {
"illuminate/support": "~11|~12",
"kwaadpepper/image-resizer": "^3.0",
"laravel/framework": "~11|~12",
"mews/purifier": "^3.4",
"php": "~8.3",
"sentry/sentry-laravel": "^4.10"
},
"require-dev": {
"larastan/larastan": "^2.9",
"orchestra/testbench": "^9.0",
"phpunit/php-code-coverage": "^11.0",
"phpunit/phpunit": "^11.0",
"slevomat/coding-standard": "^8.3",
"squizlabs/php_codesniffer": "^3.7"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Uwil\\LaravelCommon\\CommonServiceProvider"
]
}
},
"autoload": {
"files": [
"src/Helpers/methods.php"
],
"psr-4": {
"Uwil\\LaravelCommon\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Uwil\\LaravelCommon\\Tests\\": "tests"
}
},
"scripts": {
"test": [
"vendor/bin/phpunit"
],
"post-autoload-dump": [
"@php ./vendor/bin/testbench package:discover --ansi"
]
},
"license": [
"MIT"
],
"description": "UWIL Laravel common utils"
},
{
"name": "uwil/schema-org-laravel",
"version": "2.2.1",

36
resources/views/bo/layouts/head.blade.php
View file

@ -1,41 +1,23 @@
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>{{ config('app.name') }} - @yield('title')</title>
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta name="description" content="@yield('description')">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>@yield('title') - {{ config('app.name') }}</title>
@hasSection('canonical')
<link rel="canonical" href="@yield('canonical')" />
@else
<link rel="canonical" href="{{ url()->current() }}" />
@endif
<!-- META INDEX, FOLLOW -->
@hasSection('metaIndex')
<meta name="robots" content="@yield('metaIndex')">
@else
<meta name="robots" content="index, follow">
@endif
<!-- Favicon -->
{{-- GENERER favicon avec un outil https://realfavicongenerator.net/ --}}
<link rel="apple-touch-icon" sizes="180x180" href="">
<link rel="icon" type="image/png" sizes="32x32" href="">
<link rel="icon" type="image/png" sizes="16x16" href="">
<link rel="manifest" href="">
<link rel="mask-icon" href="" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
<x-uwil-common::head.favicon mask-icon-color="#5bbad5" tile-color="#da532c" theme-color="#ffffff" />
@section('metaIndex', 'noindex,nofollow')
<x-uwil-common::head.robots />
<x-uwil-common::head.canonical />
<x-uwil-common::head.og />
@include('modules.breadcrumbs.breadcrumb-head')
<!-- STYLES -->
@vite(['resources/sass/bo/bo.scss'])
@stack('styles')
{{-- DEBUG --}}
@if (config('app.debug'))
<script nonce="{{ $nonce }}">
window.vueDebug = true;

48
resources/views/fo/layouts/head.blade.php
View file

@ -1,45 +1,25 @@
<!-- Meta -->
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@hasSection('metaIndex')<meta name="robots" content="@yield('metaIndex')">@else<meta name="robots" content="index, follow">@endif
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta name="description" content="@yield('description')">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>@yield('title') - {{ config('app.name') }}</title>
<!-- Open Graph -->
<meta property="og:title" content="{{ config('app.name') }} - @yield('title')" />
<meta property="og:type" content="website" />
<meta property="og:url" content="{{ config('app.url') }}" />
<meta property="og:site_name" content="{{ config('app.name') }}" />
<meta property="og:image" content="" />
<meta property="og:description" content="@yield('description')" />
<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 />
<x-uwil-common::head.canonical />
<x-uwil-common::head.og />
<!-- Favicon -->
{{-- GENERER favicon avec un outil https://realfavicongenerator.net/ --}}
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<!-- Others -->
<title>{{ config('app.name') }} - @yield('title')</title>
@if(config('app.debug'))
<script nonce="{{ $nonce }}">window.vueDebug = true;</script>
@endif
@hasSection('canonical')
<link rel="canonical" href="@yield('canonical')" />
@else
<link rel="canonical" href="{{ \config('app.url') }}/{{ \request()->path() }}" />
@endif
@include('modules.breadcrumbs.breadcrumb-head')
<!-- STYLES -->
{{-- STYLES --}}
@vite(['resources/sass/fo/fo.scss'])
@stack('styles')
{{-- DEBUG --}}
@if (config('app.debug'))
<script nonce="{{ $nonce ?? '' }}">
window.vueDebug = true;
</script>
@endif