diff --git a/public/assets/img/france/certifications/c_est_qui_le_patron.png b/public/assets/img/france/certifications/c_est_qui_le_patron.png new file mode 100644 index 00000000..fdc0c83f Binary files /dev/null and b/public/assets/img/france/certifications/c_est_qui_le_patron.png differ diff --git a/public/assets/img/france/hero.png b/public/assets/img/france/hero.png index 57236ace..040411db 100644 Binary files a/public/assets/img/france/hero.png and b/public/assets/img/france/hero.png differ diff --git a/resources/sass/common.scss b/resources/sass/common.scss index 1783880d..f1956a99 100644 --- a/resources/sass/common.scss +++ b/resources/sass/common.scss @@ -23,3 +23,7 @@ $primary-foreground-front: hsl(227deg 65% 19%); @apply underline text-blue-500 cursor-pointer; } } + +p > ul > li { + list-style: initial; +} diff --git a/resources/ts/front/Components/Base/Head.tsx b/resources/ts/front/Components/Base/Head.tsx new file mode 100644 index 00000000..fbd1d442 --- /dev/null +++ b/resources/ts/front/Components/Base/Head.tsx @@ -0,0 +1,44 @@ +// * REACT/INERTIA +import { Head as InertiaHead, usePage } from "@inertiajs/react"; +import { AppEnv } from "@/types/global"; + +interface BreadcrumbItem { + title: string; + url: string; +} + +type HeadProps = { + title?: string; + description?: string; + breadcrumbs?: BreadcrumbItem[]; +}; + +export default function Head({ title, description, breadcrumbs }: HeadProps) { + const appEnv = usePage().props.appEnv as AppEnv; + + return ( + + {title} + {title && } + + + + + {description && } + {breadcrumbs && breadcrumbs?.length > 0 && ( + + )} + + ); +} diff --git a/resources/ts/front/Components/Theme/HeroImage.tsx b/resources/ts/front/Components/Theme/HeroImage.tsx index 54f35c7e..2c079c41 100644 --- a/resources/ts/front/Components/Theme/HeroImage.tsx +++ b/resources/ts/front/Components/Theme/HeroImage.tsx @@ -22,7 +22,11 @@ export default function HeroImage(props: HeroImageProps) { }} />
-

{title.text}

+

{description.text}

diff --git a/resources/ts/front/Layouts/AppLayout.tsx b/resources/ts/front/Layouts/AppLayout.tsx index 9393df24..791aa40f 100644 --- a/resources/ts/front/Layouts/AppLayout.tsx +++ b/resources/ts/front/Layouts/AppLayout.tsx @@ -1,4 +1,4 @@ -import { Head, usePage } from "@inertiajs/react"; +import { usePage } from "@inertiajs/react"; import { ReactNode } from "react"; import Header from "$/uwil/Header/Header"; import Footer from "$/uwil/Footer"; @@ -6,6 +6,7 @@ import GoToTop from "$/uwil/GoToTop"; import { TooltipProvider } from "@/components/ui/tooltip"; import { Toaster } from "@/components/ui/toaster"; import { RecaptchaProvider } from "../providers/RecaptchaProvider"; +import Head from "@/front/Components/Base/Head"; interface BreadcrumbItem { title: string; @@ -23,22 +24,7 @@ export default function AppLayout({ children }: AppLayoutProps) { return (
- - {breadcrumbs && breadcrumbs?.length > 0 && ( - - )} - +
diff --git a/resources/ts/front/Pages/Commitment.tsx b/resources/ts/front/Pages/Commitment.tsx index 9cf13330..d30d29e1 100644 --- a/resources/ts/front/Pages/Commitment.tsx +++ b/resources/ts/front/Pages/Commitment.tsx @@ -1,5 +1,5 @@ // * REACT/INERTIA -import { Head } from "@inertiajs/react"; +import Head from "@/front/Components/Base/Head"; // * THEME import AppLayout from "../Layouts/AppLayout"; import PageHeader from "$/uwil/PageHeader"; @@ -16,7 +16,10 @@ export default function Commitment() { const { isMobile } = useDeviceType(); return ( - + - + - +
@@ -344,7 +346,7 @@ export default function Expertise() { weight: "font-bold", }, description: { - text: "Des gammes répondant à vos cahier des charges pour l'élaboration de sauces, pâtes,...", + text: "Des gammes répondant à vos cahiers des charges pour l'élaboration de sauces, pâtes,...", }, image: { alt: "Visuel de fabrication de pâtes dans un site industriel agro-alimentaire grâce à de l'ovoproduit.", @@ -375,7 +377,7 @@ export default function Expertise() { weight: "font-bold", }, description: { - text: "Des solutions avec une qualité gustative élevé et un bon pouvoir foisonnant.", + text: "Des solutions avec une qualité gustative élevée et un bon pouvoir foisonnant.", }, image: { alt: "Visuel de mousses au chocolat réalisées par des entreprises agro-alimentaires grâce à de l'ovoproduit.", @@ -434,7 +436,8 @@ export default function Expertise() { }, image: { alt: "Visuel d'une recette de mousse au chocolat réalisée grâce au Blanc d'œuf liquide 500mL Ovoteam pensé pour l'aide pâtissière.", - title: "", + title: + "Blanc d'œuf liquide 500g en grande distribution pour pâtisserie", src: "/assets/img/expertise/gms/aide_patissiere.jpg", }, }, @@ -449,7 +452,8 @@ export default function Expertise() { }, image: { alt: "Visuel d'une recette de pancakes au brocolis réalisée grâce au Blanc d'œuf liquide 500mL ROA pensé pour les sportifs.", - title: "", + title: + "Blanc d'œuf liquide 500g en grande distribution pour sportifs", src: "/assets/img/expertise/gms/preparations_sportives.jpg", }, }, diff --git a/resources/ts/front/Pages/Gamme.tsx b/resources/ts/front/Pages/Gamme.tsx index f34542a5..5a393a85 100644 --- a/resources/ts/front/Pages/Gamme.tsx +++ b/resources/ts/front/Pages/Gamme.tsx @@ -1,6 +1,5 @@ -import { Head } from "@inertiajs/react"; +import Head from "@/front/Components/Base/Head"; import AppLayout from "../Layouts/AppLayout"; -import useTrans from "@/hooks/use-translations"; import HeroImage from "$/uwil/HeroImage"; import Section from "$/uwil/Section"; import Breadcrumbs from "$/uwil/Breadcrumbs"; @@ -11,7 +10,10 @@ import BackToHome from "$/uwil/BackToHome"; export default function Expertise() { return ( - +
Plein Air & Bio.", }} description={{ text: "Dans la démarche de diminuer l'élevage conventionnel, toutes nos gammes sont disponibles en élevage alternatif ; ainsi qu'une large offre éligible EGALIM.", diff --git a/resources/ts/front/Pages/Home.tsx b/resources/ts/front/Pages/Home.tsx index 1c2684e4..dbbbbef8 100644 --- a/resources/ts/front/Pages/Home.tsx +++ b/resources/ts/front/Pages/Home.tsx @@ -1,9 +1,8 @@ // * Packages -import { Head } from "@inertiajs/react"; +import Head from "@/front/Components/Base/Head"; import { route } from "ziggy-js"; // * Other import AppLayout from "@/front/Layouts/AppLayout"; -import useTrans from "@/hooks/use-translations"; import { bgColors, verticalPlacements } from "../lib/constants"; import { GetTranslation } from "@/lib/utils"; import str from "@/hooks/use-string"; @@ -16,7 +15,10 @@ import { usePeekCarouselOptions } from "../lib/carousels"; export default function Home() { return ( - + | null; + + const currentLocaleTitle = + dynamicPageModel.title[locale] ?? dynamicPageModel.title[fallbackLocale]; + + const seoTitle = + (currentLocaleContent?.string_seo_title as string) ?? currentLocaleTitle; + + const seoDescription = + (currentLocaleContent?.string_seo_description as string) ?? undefined; + + const htmlDescription = + (currentLocaleContent?.string_description as string) ?? ""; + + const htmlContent = (currentLocaleContent?.wysiwyg_contenu as string) ?? ""; + + return ( + + + +
+
+
+
+ ); +} diff --git a/resources/ts/front/Pages/MadeInFrance.tsx b/resources/ts/front/Pages/MadeInFrance.tsx index eca63824..59e55d8e 100644 --- a/resources/ts/front/Pages/MadeInFrance.tsx +++ b/resources/ts/front/Pages/MadeInFrance.tsx @@ -1,6 +1,5 @@ -import { Head } from "@inertiajs/react"; +import Head from "@/front/Components/Base/Head"; import AppLayout from "../Layouts/AppLayout"; -import useTrans from "@/hooks/use-translations"; import TripleColSection from "$/uwil/Sections/TripleColSection"; import { bgColors } from "../lib/constants"; import CarouselSection from "$/uwil/Sections/CarouselSection"; @@ -13,7 +12,10 @@ import { usePeekCarouselOptions } from "../lib/carousels"; export default function MadeInFrance() { return ( - +
- + - diff --git a/routes/web-front.php b/routes/web-front.php index ac17e775..3ef09137 100644 --- a/routes/web-front.php +++ b/routes/web-front.php @@ -12,11 +12,11 @@ Route::get('/nos-engagements/fabrique-en-france', function () { return Inertia::render('front/Pages/MadeInFrance'); })->name('made-in-france'); -Route::get('/nos-engagements/expertise', function () { +Route::get('/nos-engagements/expertise-depuis-1963', function () { return Inertia::render('front/Pages/Expertise'); })->name('expertise'); -Route::get('/nos-engagements/gamme', function () { +Route::get('/nos-engagements/large-gamme-plein-air', function () { return Inertia::render('front/Pages/Gamme'); })->name('gamme');