Merge branch '24-re7-feedback' into 'develop'
fix: 🐛 resolve various bugs after re7 review
See merge request ldc-web/projets/ovoteam!19
This commit is contained in:
commit
264be08046
16 changed files with 164 additions and 47 deletions
BIN
public/assets/img/france/certifications/c_est_qui_le_patron.png
Normal file
BIN
public/assets/img/france/certifications/c_est_qui_le_patron.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 134 KiB |
|
|
@ -23,3 +23,7 @@ $primary-foreground-front: hsl(227deg 65% 19%);
|
|||
@apply underline text-blue-500 cursor-pointer;
|
||||
}
|
||||
}
|
||||
|
||||
p > ul > li {
|
||||
list-style: initial;
|
||||
}
|
||||
|
|
|
|||
44
resources/ts/front/Components/Base/Head.tsx
Normal file
44
resources/ts/front/Components/Base/Head.tsx
Normal file
|
|
@ -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 (
|
||||
<InertiaHead>
|
||||
<title>{title}</title>
|
||||
{title && <meta property="og:title" content={title} />}
|
||||
<meta property="og:type" content="website" />
|
||||
<meta property="og:url" content={appEnv.url} />
|
||||
<meta property="og:site_name" content={appEnv.name} />
|
||||
<meta property="og:image" content="" />
|
||||
{description && <meta property="og:description" content={description} />}
|
||||
{breadcrumbs && breadcrumbs?.length > 0 && (
|
||||
<script type="application/ld+json">
|
||||
{JSON.stringify({
|
||||
"@context": "https://schema.org",
|
||||
"@type": "BreadcrumbList",
|
||||
itemListElement: breadcrumbs.map((crumb, index) => ({
|
||||
"@type": "ListItem",
|
||||
position: index + 1,
|
||||
name: crumb.title,
|
||||
item: crumb.url,
|
||||
})),
|
||||
})}
|
||||
</script>
|
||||
)}
|
||||
</InertiaHead>
|
||||
);
|
||||
}
|
||||
|
|
@ -22,7 +22,11 @@ export default function HeroImage(props: HeroImageProps) {
|
|||
}}
|
||||
/>
|
||||
<div className="bg-background rounded-l-3xl z-1 md:absolute md:bottom-0 md:-translate-y-[75px] md:right-0 w-full md:w-[55%] p-10">
|
||||
<p className={cn("font-bold text-3xl", title.font)}>{title.text}</p>
|
||||
<p
|
||||
className={cn("font-bold text-3xl", title.font)}
|
||||
// eslint-disable-next-line react/no-danger
|
||||
dangerouslySetInnerHTML={{ __html: title.text }}
|
||||
/>
|
||||
<p className={cn("mt-4", description.font)}>{description.text}</p>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
<div className="relative">
|
||||
<Head>
|
||||
{breadcrumbs && breadcrumbs?.length > 0 && (
|
||||
<script type="application/ld+json">
|
||||
{JSON.stringify({
|
||||
"@context": "https://schema.org",
|
||||
"@type": "BreadcrumbList",
|
||||
itemListElement: breadcrumbs.map((crumb, index) => ({
|
||||
"@type": "ListItem",
|
||||
position: index + 1,
|
||||
name: crumb.title,
|
||||
item: crumb.url,
|
||||
})),
|
||||
})}
|
||||
</script>
|
||||
)}
|
||||
</Head>
|
||||
<Head breadcrumbs={breadcrumbs} />
|
||||
<Header />
|
||||
<Toaster />
|
||||
<RecaptchaProvider>
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
<AppLayout>
|
||||
<Head title={useTrans("front.engage")} />
|
||||
<Head
|
||||
title="Fabriqué en France, Gamme œufs Plein Air et À vos côtés depuis 1963"
|
||||
description="3 sites de production Français et certifiés Œufs de France, une large gamme de produits Plein Air et le développement de solutions innovantes depuis 60 ans."
|
||||
/>
|
||||
<PageHeader
|
||||
title={{
|
||||
text: "Ovoteam s'engage",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// * PACKAGES
|
||||
import { Head } from "@inertiajs/react";
|
||||
import Head from "@/front/Components/Base/Head";
|
||||
// * BASE
|
||||
import AppLayout from "../../Layouts/AppLayout";
|
||||
import useTrans from "@/hooks/use-translations";
|
||||
|
|
@ -11,7 +11,10 @@ import Image from "@/front/Components/Theme/Image";
|
|||
export default function ContactUs() {
|
||||
return (
|
||||
<AppLayout>
|
||||
<Head title={useTrans("front.contactpage")} />
|
||||
<Head
|
||||
title="Contactez notre service client, rapide et à votre écoute."
|
||||
description="Vous souhaitez des renseignements sur nos gammes de produits ou notre entreprise ? Contactez Ovoteam via notre formulaire en ligne ou directement par téléphone."
|
||||
/>
|
||||
<PageHeader
|
||||
title={{
|
||||
text: "Nous contacter",
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
// * INERTIA
|
||||
import { Head } from "@inertiajs/react";
|
||||
import Head from "@/front/Components/Base/Head";
|
||||
// * THEME
|
||||
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";
|
||||
|
|
@ -17,7 +16,10 @@ export default function Expertise() {
|
|||
const { isMobile } = useDeviceType();
|
||||
return (
|
||||
<AppLayout>
|
||||
<Head title={useTrans("front.expertise")} />
|
||||
<Head
|
||||
title="Créateur de solutions à base d'œuf innovantes depuis 1963."
|
||||
description="Partenaire de la restauration, de l'industrie agro-alimentaire et de la GMS, nous développons des solutions à base d'œuf innovantes depuis plus de 60 ans."
|
||||
/>
|
||||
<Section className="md:hidden py-3">
|
||||
<Breadcrumbs
|
||||
breadcrumbs={[
|
||||
|
|
@ -42,7 +44,7 @@ export default function Expertise() {
|
|||
image={{
|
||||
alt: "Meringues pouvant être réalisées par des professionnels grâce au Blanc des Chefs Plein Air Ovoteam",
|
||||
title:
|
||||
"A vos côtés depuis 1963 en proposant des solutions innovantes.",
|
||||
"À vos côtés depuis 1963 en proposant des solutions innovantes.",
|
||||
src: "/assets/img/expertise/hero.jpg",
|
||||
}}
|
||||
/>
|
||||
|
|
@ -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",
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
<AppLayout>
|
||||
<Head title={useTrans("front.gamme")} />
|
||||
<Head
|
||||
title="Large Gamme disponible en alternatif : Sol, Plein Air et Bio."
|
||||
description="Ovoteam propose une large gamme de produits issus d'élevages alternatif : Sol, Plein Air & Bio. Ainsi qu'une large offre éligible EGALIM."
|
||||
/>
|
||||
<Section className="md:hidden py-3">
|
||||
<Breadcrumbs
|
||||
breadcrumbs={[
|
||||
|
|
@ -28,7 +30,7 @@ export default function Expertise() {
|
|||
</Section>
|
||||
<HeroImage
|
||||
title={{
|
||||
text: "Large choix de produits issus d'élevages alternatifs : Sol, Plein Air & Bio.",
|
||||
text: "Large choix de produits issus d'élevages alternatifs : Sol, <br /> 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.",
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
<AppLayout>
|
||||
<Head title={useTrans("front.homepage")} />
|
||||
<Head
|
||||
title="Ovoteam : spécialiste des Ovoproduits depuis 1963 !"
|
||||
description="Ovoteam, spécialiste des ovoproduits pour la Restauration, l'Industrie et la GMS grâce à une large gamme de produits issus d'élevages alternatifs (Sol, Plein air et Bio)."
|
||||
/>
|
||||
<VideoBanner />
|
||||
<CarouselSection
|
||||
carousel={usePeekCarouselOptions()}
|
||||
|
|
@ -288,7 +290,7 @@ export default function Home() {
|
|||
}}
|
||||
button={{
|
||||
href: "https://recrutement.ldc.fr/fr/annonces?brands=2625",
|
||||
label: "Rejoignez-nous",
|
||||
label: "Découvrez nos offres d'emploi !",
|
||||
placement: verticalPlacements.TOP,
|
||||
}}
|
||||
variant={bgColors.BACKGROUND}
|
||||
|
|
|
|||
60
resources/ts/front/Pages/LegalPage.tsx
Normal file
60
resources/ts/front/Pages/LegalPage.tsx
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
// * Packages
|
||||
import { usePage } from "@inertiajs/react";
|
||||
// * Other
|
||||
import { DynamicPageModelWithRelations } from "@/back/types/dynamic-pages";
|
||||
import { AppEnv } from "@/types/global";
|
||||
import Head from "@/front/Components/Base/Head";
|
||||
// * THEME
|
||||
import AppLayout from "../Layouts/AppLayout";
|
||||
import PageHeader from "$/uwil/PageHeader";
|
||||
import Section from "$/uwil/Section";
|
||||
|
||||
type LegalPageProps = {
|
||||
dynamicPageModel: DynamicPageModelWithRelations;
|
||||
};
|
||||
|
||||
export default function LegalPage({ dynamicPageModel }: LegalPageProps) {
|
||||
const { locale, fallbackLocale } = usePage().props.appEnv as AppEnv;
|
||||
|
||||
const currentLocaleContent = (dynamicPageModel.content?.[locale] ??
|
||||
dynamicPageModel.content?.[fallbackLocale]) as unknown as Record<
|
||||
string,
|
||||
unknown
|
||||
> | 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 (
|
||||
<AppLayout>
|
||||
<Head title={seoTitle} description={seoDescription} />
|
||||
<PageHeader
|
||||
title={{
|
||||
text: currentLocaleTitle,
|
||||
}}
|
||||
description={{
|
||||
text: htmlDescription,
|
||||
}}
|
||||
/>
|
||||
<Section className="text-start tiptap">
|
||||
<div
|
||||
// eslint-disable-next-line react/no-danger
|
||||
dangerouslySetInnerHTML={{
|
||||
__html: String(htmlContent),
|
||||
}}
|
||||
/>
|
||||
</Section>
|
||||
</AppLayout>
|
||||
);
|
||||
}
|
||||
|
|
@ -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 (
|
||||
<AppLayout>
|
||||
<Head title={useTrans("front.made-in-france")} />
|
||||
<Head
|
||||
title="Ovoproduits élaborés au sein de 3 sites de production Français."
|
||||
description="Ovoproduits élaborés dans 3 sites Français certifiés Œufs de France, BRC, FSSC22000 et Bio. Nos productions d'ovoproduits sous maîtrise HACCP."
|
||||
/>
|
||||
<Section className="md:hidden py-3">
|
||||
<Breadcrumbs
|
||||
breadcrumbs={[
|
||||
|
|
@ -171,7 +173,7 @@ export default function MadeInFrance() {
|
|||
alt: "Logo officiel de « C'est Qui le Patron ? », marque de produits co-construits en soutien aux producteurs.",
|
||||
title:
|
||||
"Productions utilisées dans des produits à marque C'est Qui le Patron ?",
|
||||
src: "/assets/img/france/certifications/oeufs_de_france.png",
|
||||
src: "/assets/img/france/certifications/c_est_qui_le_patron.png",
|
||||
},
|
||||
},
|
||||
]}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
// * REACT/INERTIA
|
||||
import { Head, useForm } from "@inertiajs/react";
|
||||
import Head from "@/front/Components/Base/Head";
|
||||
import { useForm } from "@inertiajs/react";
|
||||
// * SHADCN
|
||||
import {
|
||||
InputGroup,
|
||||
|
|
@ -32,7 +33,10 @@ export default function Search() {
|
|||
};
|
||||
return (
|
||||
<AppLayout>
|
||||
<Head title={useTrans("front.search")} />
|
||||
<Head
|
||||
title="Recherchez parmi toutes nos références."
|
||||
description="Parcourez les gammes de produits Ovoteam pour trouver le produit qui répondra à votre besoin."
|
||||
/>
|
||||
<PageHeader
|
||||
title={{
|
||||
text: "Rechercher",
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
<x-uwil-common::head.robots />
|
||||
<x-uwil-common::head.canonical />
|
||||
<x-uwil-common::head.hreflang />
|
||||
<x-uwil-common::head.og />
|
||||
<x-uwil-common::head.favicon mask-icon-color="#ff0000" tile-color="#ff0000" theme-color="#ff0000" />
|
||||
|
||||
<!-- Scripts -->
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue