diff --git a/manifest.yaml b/manifest.yaml index 915c332..ff9800f 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -10,7 +10,7 @@ data: APP_DEBUG: "${APP_APP_DEBUG}" APP_URL: "https://${REDIRECT}${APP_DOMAIN}" LOG_CHANNEL: "k8s" - DB_HOST: "mariadb.common-services" + DB_HOST: "${APP_DB_HOST}" DB_DATABASE: "${APP_DB_DATABASE}" DB_USERNAME: "${APP_DB_USERNAME}" DB_PASSWORD: "${APP_DB_PASSWORD}" @@ -131,6 +131,8 @@ metadata: name: ${CI_PROJECT_PATH_SLUG}-cronjob spec: schedule: "* * * * *" + successfulJobsHistoryLimit: 1 + failedJobsHistoryLimit: 1 concurrencyPolicy: Forbid jobTemplate: spec: diff --git a/resources/assets/images/100LOCAL-V1.png b/resources/assets/images/100LOCAL-V1.png deleted file mode 100644 index 69aa91b..0000000 Binary files a/resources/assets/images/100LOCAL-V1.png and /dev/null differ diff --git a/resources/assets/images/100LOCAL-V2.png b/resources/assets/images/100LOCAL-V2.png deleted file mode 100644 index cf3deb1..0000000 Binary files a/resources/assets/images/100LOCAL-V2.png and /dev/null differ diff --git a/resources/assets/images/Frise-images-issue-22.jpg b/resources/assets/images/Frise-images-issue-22.jpg deleted file mode 100644 index bd295d7..0000000 Binary files a/resources/assets/images/Frise-images-issue-22.jpg and /dev/null differ diff --git a/resources/assets/images/PACK-issue-22.jpg b/resources/assets/images/PACK-issue-22.jpg deleted file mode 100644 index c3e93c3..0000000 Binary files a/resources/assets/images/PACK-issue-22.jpg and /dev/null differ diff --git a/resources/assets/images/Pack-cuillere-issue-22.jpg b/resources/assets/images/Pack-cuillere-issue-22.jpg deleted file mode 100644 index 2325b90..0000000 Binary files a/resources/assets/images/Pack-cuillere-issue-22.jpg and /dev/null differ diff --git a/resources/assets/images/chicken-with-logo.jpg b/resources/assets/images/chicken-with-logo.jpg new file mode 100644 index 0000000..ffb97de Binary files /dev/null and b/resources/assets/images/chicken-with-logo.jpg differ diff --git a/resources/assets/images/logo-poulet-100-local-big.png b/resources/assets/images/logo-poulet-100-local-big.png new file mode 100644 index 0000000..ee7211c Binary files /dev/null and b/resources/assets/images/logo-poulet-100-local-big.png differ diff --git a/resources/assets/images/logo-poulet-100-local-small.png b/resources/assets/images/logo-poulet-100-local-small.png new file mode 100644 index 0000000..56d933d Binary files /dev/null and b/resources/assets/images/logo-poulet-100-local-small.png differ diff --git a/resources/assets/images/photos-with-logo.png b/resources/assets/images/photos-with-logo.png new file mode 100644 index 0000000..d9637d1 Binary files /dev/null and b/resources/assets/images/photos-with-logo.png differ diff --git a/resources/assets/images/poulet-label.jpg b/resources/assets/images/poulet-label.jpg deleted file mode 100644 index 30a7c59..0000000 Binary files a/resources/assets/images/poulet-label.jpg and /dev/null differ diff --git a/resources/assets/images/sausage-with-logo.jpg b/resources/assets/images/sausage-with-logo.jpg new file mode 100644 index 0000000..9e1cba7 Binary files /dev/null and b/resources/assets/images/sausage-with-logo.jpg differ diff --git a/resources/assets/images/spoon-with-logo.jpg b/resources/assets/images/spoon-with-logo.jpg new file mode 100644 index 0000000..c969ec6 Binary files /dev/null and b/resources/assets/images/spoon-with-logo.jpg differ diff --git a/resources/sass/fo/base/_fonts.scss b/resources/sass/fo/base/_fonts.scss index a1e503b..3cf641a 100644 --- a/resources/sass/fo/base/_fonts.scss +++ b/resources/sass/fo/base/_fonts.scss @@ -205,14 +205,6 @@ $dkmoonlight: "DK Moonlight Serenade"; } } -.font-dkmoonlight { - font-family: $dkmoonlight; - - &-34 { - font-size: 34px; - } -} - @media screen and (width >= 992px) { .font-amatic { &-before::before { diff --git a/resources/sass/fo/utilities/_helpers.scss b/resources/sass/fo/utilities/_helpers.scss index d3bc9ad..6d8261e 100644 --- a/resources/sass/fo/utilities/_helpers.scss +++ b/resources/sass/fo/utilities/_helpers.scss @@ -224,7 +224,7 @@ li strong { display: inline-block; width: 500px; height: 500px; - background-image: url("@/images/Pack-cuillere-issue-22.jpg"); + background-image: url("@/images/spoon-with-logo.jpg"); background-repeat: no-repeat; background-size: contain; content: ""; @@ -238,7 +238,7 @@ li strong { display: inline-block; width: 550px; height: 550px; - background-image: url("@/images/PACK-issue-22.jpg"); + background-image: url("@/images/sausage-with-logo.jpg"); background-repeat: no-repeat; background-size: contain; content: ""; diff --git a/resources/views/fo/layouts/footer.blade.php b/resources/views/fo/layouts/footer.blade.php index 0d38e8e..a3b423f 100644 --- a/resources/views/fo/layouts/footer.blade.php +++ b/resources/views/fo/layouts/footer.blade.php @@ -31,7 +31,7 @@
-
+ -
-

{{ __('Nos certifications') }}

-
    -
  • - Logo de la certification Critères qualité certifiés -
  • -
  • - Logo de la certification Saveurs en Or -
  • - {{--
  • - Logo 100% local -
  • --}} -
-
diff --git a/resources/views/fo/pages/contact.blade.php b/resources/views/fo/pages/contact.blade.php index dfad2f8..27120a2 100644 --- a/resources/views/fo/pages/contact.blade.php +++ b/resources/views/fo/pages/contact.blade.php @@ -39,7 +39,7 @@
- Un poulet roux avec un sticker 100% local
diff --git a/resources/views/fo/pages/engagments.blade.php b/resources/views/fo/pages/engagments.blade.php index d3cfae0..dc3e2c9 100644 --- a/resources/views/fo/pages/engagments.blade.php +++ b/resources/views/fo/pages/engagments.blade.php @@ -6,7 +6,7 @@ @section('content')
- Logo 100% local + Logo 100% local
Un paysage de campagne
@@ -35,8 +35,8 @@

{{ __('Des produits de qualité bons et accessibles') }}

-

{{ __('Garantis 100% Hauts-De-France') }}

-

{{ __('Avec notre label 100% LOCAL, certifié et contrôlé par un cahier des charges précis, nous garantissons l\'origine de nos produits issus de poulets nés, élevés et préparés en région des Hauts de France.') }} +

{{ __('Garantis Poulet 100% Hauts-De-France') }}

+

{{ __('Avec notre label Poulet 100% LOCAL, certifié et contrôlé par un cahier des charges précis, nous garantissons l\'origine de nos produits issus de poulets nés, élevés et préparés en région des Hauts de France.') }}

diff --git a/resources/views/fo/pages/home.blade.php b/resources/views/fo/pages/home.blade.php index 7bb6eba..88fd913 100644 --- a/resources/views/fo/pages/home.blade.php +++ b/resources/views/fo/pages/home.blade.php @@ -6,12 +6,12 @@ @section('content')
- Logo 100% local + Logo 100% local diff --git a/resources/views/fo/pages/local.blade.php b/resources/views/fo/pages/local.blade.php index 781af0a..5110b57 100644 --- a/resources/views/fo/pages/local.blade.php +++ b/resources/views/fo/pages/local.blade.php @@ -6,7 +6,7 @@ @section('content')
- Logo 100% local + Logo 100% local
Un paysage de campagne
@@ -33,7 +33,7 @@
- Une frise d'images avec des poussins, un éleveur, un camion de transport, des cuisses de poulets cuites
diff --git a/resources/views/fo/pages/map.blade.php b/resources/views/fo/pages/map.blade.php index 496a2c0..9f46f10 100644 --- a/resources/views/fo/pages/map.blade.php +++ b/resources/views/fo/pages/map.blade.php @@ -6,7 +6,7 @@ @section('content')
- Logo 100% local + Logo 100% local
Un plat de poulet rôti et ses accompagnements sortant du four diff --git a/resources/views/fo/pages/policies.blade.php b/resources/views/fo/pages/policies.blade.php index 2c30f2e..4f720fc 100644 --- a/resources/views/fo/pages/policies.blade.php +++ b/resources/views/fo/pages/policies.blade.php @@ -14,7 +14,7 @@

Vous êtes ici

- @include('modules.breadcrumbs.breadcrumb-body') + @include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $staticPageModel])
diff --git a/resources/views/fo/pages/products/index.blade.php b/resources/views/fo/pages/products/index.blade.php index cf13901..9dba460 100644 --- a/resources/views/fo/pages/products/index.blade.php +++ b/resources/views/fo/pages/products/index.blade.php @@ -11,7 +11,7 @@ @section('content')
- Logo 100% local + Logo 100% local
Des poulets dans un élevage
@@ -66,7 +66,7 @@ Une illustration d'une tour dans un soleil

{{ __('Découvrez les engagements') }}
{{ __('d\'une filière engagée') }}{{ __('pour manger bon, sain') }}
{{ __('et 100% local') }}

+ class="font-amatic-red">{{ __('pour manger bon, sain') }}
{{ __('et Poulet 100% local') }} {{ __('En savoir plus >') }} diff --git a/resources/views/fo/pages/products/range-products.blade.php b/resources/views/fo/pages/products/range-products.blade.php index dba6fe8..0a40f45 100644 --- a/resources/views/fo/pages/products/range-products.blade.php +++ b/resources/views/fo/pages/products/range-products.blade.php @@ -11,7 +11,7 @@ @section('content')
- Logo 100% local + Logo 100% local
{{ $publishedRange->banner_alt }} diff --git a/resources/views/fo/partials/local-block.blade.php b/resources/views/fo/partials/local-block.blade.php index 6e0d530..65a1b6e 100644 --- a/resources/views/fo/partials/local-block.blade.php +++ b/resources/views/fo/partials/local-block.blade.php @@ -2,10 +2,10 @@
- Logo 100% local + Logo 100% local
-

{{ __('Chez Lionor le') }}{{ __('100% local') }}{{ __('C\'est...') }}

+

{{ __('Chez Lionor le') }}{{ __('Poulet 100% local') }}{{ __('C\'est...') }}

diff --git a/routes/breadcrumbs-fo.php b/routes/breadcrumbs-fo.php index d35094e..9cd874d 100644 --- a/routes/breadcrumbs-fo.php +++ b/routes/breadcrumbs-fo.php @@ -3,6 +3,7 @@ use App\Models\Product; use App\Models\Range; use App\Models\Recipe; +use App\Models\StaticPage; use Diglactic\Breadcrumbs\Breadcrumbs; use Diglactic\Breadcrumbs\Generator; use Illuminate\Support\Str; @@ -81,10 +82,10 @@ Breadcrumbs::for('contact.show', function (Generator $trail) { }); // * FOOTER -Breadcrumbs::for('policies', function (Generator $trail) { +Breadcrumbs::for('policies', function (Generator $trail, StaticPage $staticPage) { $trail->parent('home'); $trail->push( - Str::ucfirst(trans('Politique des données personnelles')), + Str::ucfirst(trans($staticPage->seo_title)), route('policies') ); });