diff --git a/config/scout.php b/config/scout.php index d05b4e71..2aaff95c 100644 --- a/config/scout.php +++ b/config/scout.php @@ -20,7 +20,7 @@ return [ | */ - 'driver' => env('SCOUT_DRIVER', 'meilisearch'), + 'driver' => env('SCOUT_DRIVER'), /* |-------------------------------------------------------------------------- diff --git a/lang/en/front.php b/lang/en/front.php index f00d88dc..1808cd00 100644 --- a/lang/en/front.php +++ b/lang/en/front.php @@ -57,7 +57,7 @@ return [ 'label' => 'Type of breeding desired' ], 'geo_zone' => [ - 'label' => 'Geographic area of ​​your project', + 'label' => 'Geographic area of your project', 'placeholder' => 'Drop-down list of departments' ], 'your_project' => [ @@ -156,5 +156,23 @@ return [ 'validate' => 'Confirm', 'policy_message' => 'For any additional information regarding your personal data and your rights, please consult our ' ], - 'finance-maintenance' => 'The stock market prices are currently undergoing maintenance. We apologise for any inconvenience caused. We are working to restore the service as soon as possible.' + 'finance-maintenance' => 'The stock market prices are currently undergoing maintenance. We apologise for any inconvenience caused. We are working to restore the service as soon as possible.', + 'bea_banner' => [ + 'region_label' => 'Animal welfare and LDC commitments', + 'logo_alt' => 'Animal Welfare Logo - Committed Agricultural Chain', + 'commitments_intro' => 'Discover our commitments :br on', + 'site_url_text' => 'www.bienetreanimal.fr', + 'site_link_title' => 'Visit the website www.bienetreanimal.fr (new window)', + 'site_link_aria' => 'Visit the website www.bienetreanimal.fr (new window)', + 'company' => 'LDC', + 'title' => 'Member company of the collective', + 'subtitle' => 'Committed Agricultural Chain to elevate Animal Welfare', + 'description' => '100% French origin chicken :br raised with RESPECT FOR ANIMAL WELFARE:br by a COMMITTED AGRICULTURAL CHAIN', + 'description_html' => '100% French origin chicken :br raised with RESPECT FOR ANIMAL WELFARE:br by a COMMITTED AGRICULTURAL CHAIN', + 'ldc_alt' => 'LDC logo', + 'cta_text' => 'Discover our commitments here', + 'cta_title' => 'Discover our commitments to animal welfare on www.bienetreanimal.fr (new window)', + 'cta_aria' => 'Discover our commitments to animal welfare on www.bienetreanimal.fr (new window)', + 'new_window' => 'new window', + ], ]; diff --git a/lang/fr/front.php b/lang/fr/front.php index 378fa9bf..bc4ee8fb 100644 --- a/lang/fr/front.php +++ b/lang/fr/front.php @@ -157,5 +157,23 @@ return [ 'validate' => 'Valider', 'policy_message' => 'Pour toute information complémentaire concernant vos données personnelles et vos droits, merci de consulter notre' ], - 'finance-maintenance' => 'Affichage du cours de la bourse en cours de maintenance, veuillez nous excuser pour la gêne occasionnée. Nous nous efforçons de rétablir le service dans les meilleurs délais.' + 'finance-maintenance' => 'Affichage du cours de la bourse en cours de maintenance, veuillez nous excuser pour la gêne occasionnée. Nous nous efforçons de rétablir le service dans les meilleurs délais.', + 'bea_banner' => [ + 'region_label' => 'Bien-être animal et engagements LDC', + 'logo_alt' => 'Logo Bien-être Animal - Filière Agricole Engagée', + 'commitments_intro' => 'Retrouvez nos engagements :br sur', + 'site_url_text' => 'www.bienetreanimal.fr', + 'site_link_title' => 'Visiter le site www.bienetreanimal.fr (nouvelle fenêtre)', + 'site_link_aria' => 'Visiter le site www.bienetreanimal.fr (nouvelle fenêtre)', + 'company' => 'LDC', + 'title' => 'Entreprise adhérente au collectif', + 'subtitle' => 'Filière Agricole Engagée pour élever le Bien-être Animal', + 'description' => 'Du poulet 100% origine France :br élevé dans le RESPECT DU BIEN-ÊTRE ANIMAL :br par une FILIÈRE AGRICOLE ENGAGÉE', + 'description_html' => 'Du poulet 100% origine France :br élevé dans le RESPECT DU BIEN-ÊTRE ANIMAL :br par une FILIÈRE AGRICOLE ENGAGÉE', + 'ldc_alt' => 'Logo LDC', + 'cta_text' => 'Retrouvez nos engagements ici', + 'cta_title' => 'Retrouvez nos engagements en faveur du bien-être animal sur www.bienetreanimal.fr (nouvelle fenêtre)', + 'cta_aria' => 'Retrouvez nos engagements en faveur du bien-être animal sur www.bienetreanimal.fr (nouvelle fenêtre)', + 'new_window' => 'nouvelle fenêtre', + ], ]; diff --git a/manifest.yaml b/manifest.yaml index 7b67a168..85bcd223 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -40,6 +40,7 @@ data: GOOGLE_RECAPTCHA_PUBLIC: "${APP_GOOGLE_RECAPTCHA_PUBLIC}" GOOGLE_RECAPTCHA_VERSION: "${APP_GOOGLE_RECAPTCHA_VERSION}" GOOGLE_MAPS_KEY: "${APP_GOOGLE_MAPS_KEY}" + SCOUT_DRIVER: "${APP_SCOUT_DRIVER}" SCOUT_PREFIX: "${APP_SCOUT_PREFIX}" SCOUT_QUEUE: "${APP_SCOUT_QUEUE}" MEILISEARCH_HOST: "meilisearch.common-services:7700" diff --git a/resources/assets/fonts/Poppins/Poppins-Black.ttf b/resources/assets/fonts/Poppins/Poppins-Black.ttf new file mode 100644 index 00000000..71c0f995 Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-Black.ttf differ diff --git a/resources/assets/fonts/Poppins/Poppins-BlackItalic.ttf b/resources/assets/fonts/Poppins/Poppins-BlackItalic.ttf new file mode 100644 index 00000000..7aeb58bd Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-BlackItalic.ttf differ diff --git a/resources/assets/fonts/Poppins/Poppins-Bold.ttf b/resources/assets/fonts/Poppins/Poppins-Bold.ttf new file mode 100644 index 00000000..00559eeb Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-Bold.ttf differ diff --git a/resources/assets/fonts/Poppins/Poppins-BoldItalic.ttf b/resources/assets/fonts/Poppins/Poppins-BoldItalic.ttf new file mode 100644 index 00000000..e61e8e88 Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-BoldItalic.ttf differ diff --git a/resources/assets/fonts/Poppins/Poppins-Italic.ttf b/resources/assets/fonts/Poppins/Poppins-Italic.ttf new file mode 100644 index 00000000..12b7b3c4 Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-Italic.ttf differ diff --git a/resources/assets/fonts/Poppins/Poppins-Light.ttf b/resources/assets/fonts/Poppins/Poppins-Light.ttf new file mode 100644 index 00000000..bc36bcc2 Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-Light.ttf differ diff --git a/resources/assets/fonts/Poppins/Poppins-Medium.ttf b/resources/assets/fonts/Poppins/Poppins-Medium.ttf new file mode 100644 index 00000000..6bcdcc27 Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-Medium.ttf differ diff --git a/resources/assets/fonts/Poppins/Poppins-Regular.ttf b/resources/assets/fonts/Poppins/Poppins-Regular.ttf new file mode 100644 index 00000000..9f0c71b7 Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-Regular.ttf differ diff --git a/resources/assets/fonts/Poppins/Poppins-SemiBold.ttf b/resources/assets/fonts/Poppins/Poppins-SemiBold.ttf new file mode 100644 index 00000000..74c726e3 Binary files /dev/null and b/resources/assets/fonts/Poppins/Poppins-SemiBold.ttf differ diff --git a/resources/assets/images/front/coeur.svg b/resources/assets/images/front/coeur.svg new file mode 100644 index 00000000..0c235c65 --- /dev/null +++ b/resources/assets/images/front/coeur.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/assets/images/front/ldc-sign.png b/resources/assets/images/front/ldc-sign.png new file mode 100644 index 00000000..d460a73b Binary files /dev/null and b/resources/assets/images/front/ldc-sign.png differ diff --git a/resources/assets/images/front/logo_bea.svg b/resources/assets/images/front/logo_bea.svg new file mode 100644 index 00000000..f1f97a4e --- /dev/null +++ b/resources/assets/images/front/logo_bea.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/assets/images/front/soleil.svg b/resources/assets/images/front/soleil.svg new file mode 100644 index 00000000..acaf668d --- /dev/null +++ b/resources/assets/images/front/soleil.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/sass/front/app.scss b/resources/sass/front/app.scss index c1f1575e..368c8e95 100644 --- a/resources/sass/front/app.scss +++ b/resources/sass/front/app.scss @@ -8,3 +8,9 @@ // * BASE @use './base/common'; +@use './base/fonts'; +@use './base/tailwind-scope'; + +// * TAILWIND +@tailwind components; +@tailwind utilities; diff --git a/resources/sass/front/base/_fonts.scss b/resources/sass/front/base/_fonts.scss new file mode 100644 index 00000000..77fcf51a --- /dev/null +++ b/resources/sass/front/base/_fonts.scss @@ -0,0 +1,86 @@ +//////////////////// Poppins //////////////////// + +/* Poppins - Light */ +@font-face { + font-display: swap; + font-family: Poppins; + font-style: normal; + font-weight: 300; + src: url('&/fonts/Poppins/Poppins-Light.ttf') format('truetype'); +} + +/* Poppins - Regular */ +@font-face { + font-display: swap; + font-family: Poppins; + font-style: normal; + font-weight: 400; + src: url('&/fonts/Poppins/Poppins-Regular.ttf') format('truetype'); +} + +/* Poppins - Italic */ +@font-face { + font-display: swap; + font-family: Poppins; + font-style: italic; + font-weight: 400; + src: url('&/fonts/Poppins/Poppins-Italic.ttf') format('truetype'); +} + +/* Poppins - Medium */ +@font-face { + font-display: swap; + font-family: Poppins; + font-style: normal; + font-weight: 500; + src: url('&/fonts/Poppins/Poppins-Medium.ttf') format('truetype'); +} + +/* Poppins - Semi Bold */ +@font-face { + font-display: swap; + font-family: Poppins; + font-style: normal; + font-weight: 600; + src: url('&/fonts/Poppins/Poppins-SemiBold.ttf') format('truetype'); +} + +/* Poppins - Bold */ +@font-face { + font-display: swap; + font-family: Poppins; + font-style: normal; + font-weight: 700; + src: url('&/fonts/Poppins/Poppins-Bold.ttf') format('truetype'); +} + +/* Poppins - Bold Italic */ +@font-face { + font-display: swap; + font-family: Poppins; + font-style: italic; + font-weight: 700; + src: url('&/fonts/Poppins/Poppins-BoldItalic.ttf') format('truetype'); +} + +/* Poppins - Black */ +@font-face { + font-display: swap; + font-family: 'Poppins Black'; + font-style: normal; + font-weight: 900; + src: url('&/fonts/Poppins/Poppins-Black.ttf') format('truetype'); +} + +/* Poppins - Black Italic */ +@font-face { + font-display: swap; + font-family: 'Poppins Black'; + font-style: italic; + font-weight: 900; + src: url('&/fonts/Poppins/Poppins-BlackItalic.ttf') format('truetype'); +} + +.f-poppins { + font-family: Poppins, sans-serif; +} diff --git a/resources/sass/front/base/_tailwind-scope.scss b/resources/sass/front/base/_tailwind-scope.scss new file mode 100644 index 00000000..06625dce --- /dev/null +++ b/resources/sass/front/base/_tailwind-scope.scss @@ -0,0 +1,16 @@ +:where(.tailwind-scope, #bea-encart), +:where(.tailwind-scope, #bea-encart) :where(*, *::before, *::after) { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; +} diff --git a/resources/ts/front/app.ts b/resources/ts/front/app.ts index 39e4eacf..87293ef8 100644 --- a/resources/ts/front/app.ts +++ b/resources/ts/front/app.ts @@ -1,6 +1,6 @@ // * Packages -import Chart from "chart.js/auto"; import axios from "axios"; +import Chart from "chart.js/auto"; // * Other import "../../sass/front/app.scss"; @@ -10,6 +10,9 @@ import CookieNotice from "@ldc-web/cookie-notice"; // LOCAL IMPORTS import "./base/common"; +// * ASSETS +import.meta.glob("../../assets/images/**/*", { eager: true }); + axios.defaults.headers.common = { Accept: "application/json, text/plain, */*", "X-Requested-With": "XMLHttpRequest", diff --git a/resources/ts/vite-env.d.ts b/resources/ts/vite-env.d.ts new file mode 100644 index 00000000..b4bddf52 --- /dev/null +++ b/resources/ts/vite-env.d.ts @@ -0,0 +1,9 @@ +/// + +interface ImportMetaEnv { + readonly VITE_SENTRY_TRACES_SAMPLE_RATE: string | undefined; +} + +interface ImportMeta { + readonly env: ImportMetaEnv; +} diff --git a/resources/views/front/pages/our-commitment.blade.php b/resources/views/front/pages/our-commitment.blade.php index 1a1aa6fb..17b86018 100644 --- a/resources/views/front/pages/our-commitment.blade.php +++ b/resources/views/front/pages/our-commitment.blade.php @@ -94,6 +94,10 @@ @endphp @endforeach @foreach ($sections as $section) + @if($section['title'] === 'bea_content') + @include('front.pages.partials.bea_content') + @continue + @endif @endforeach @endif diff --git a/resources/views/front/pages/partials/bea_content.blade.php b/resources/views/front/pages/partials/bea_content.blade.php new file mode 100644 index 00000000..229c0484 --- /dev/null +++ b/resources/views/front/pages/partials/bea_content.blade.php @@ -0,0 +1,73 @@ +
+
+
+
+ + {{-- Colonne gauche --}} +
+ {{ __('front.bea_banner.logo_alt') }} +

+ {!! __('front.bea_banner.commitments_intro', ['br' => '
']) !!} + {{ __('front.bea_banner.site_url_text') }} + ({{ __('front.bea_banner.new_window') }}) +

+
+ + {{-- Colonne centrale --}} +
+

+ {{ __('front.bea_banner.company') }}
+ + {{ __('front.bea_banner.title') }} + +
+ {{ __('front.bea_banner.subtitle') }} +

+ +
+ + {{ __('front.bea_banner.ldc_alt') }} +
+ +

+ {!! __('front.bea_banner.description', ['br' => '
']) !!} +

+ +
+ + {{ __('front.bea_banner.cta_text') }} + + ({{ __('front.bea_banner.new_window') }}) + +
+
+ + {{-- Signature LDC --}} + + +
+ + {{-- Décoration : Soleil en bas à droite (partiellement tronqué par le conteneur) --}} + +
+
+
diff --git a/routes/breadcrumbs-front.php b/routes/breadcrumbs-front.php index ec00f166..9fe53107 100644 --- a/routes/breadcrumbs-front.php +++ b/routes/breadcrumbs-front.php @@ -6,9 +6,14 @@ use App\Models\DynamicPage; use App\Models\News; use Diglactic\Breadcrumbs\Breadcrumbs; use Diglactic\Breadcrumbs\Generator; +use Illuminate\Support\Facades\Schema; use Illuminate\Support\Str; use Mcamara\LaravelLocalization\Facades\LaravelLocalization; +if (!Schema::hasTable('dynamic_pages')) { + return; +} + $currentLocale = app()->getLocale(); $supportedLocales = LaravelLocalization::getSupportedLanguagesKeys(); $pageHome = DynamicPage::getModelsCached() diff --git a/tailwind.config.js b/tailwind.config.js index d33e644f..d1ea483e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -25,6 +25,10 @@ export default { sans: [ 'Figtree', ...defaultTheme.fontFamily.sans + ], + poppins: [ + 'Poppins', + ...defaultTheme.fontFamily.sans ] }, borderRadius: {