diff --git a/lang/de/front.php b/lang/de/front.php index 1fa142c..5654b44 100644 --- a/lang/de/front.php +++ b/lang/de/front.php @@ -104,9 +104,10 @@ return [ ], 'independentControls' => [ 'title' => 'Unabhängige Kontrollen', - 'text1' => 'Die externen Kontrollen der QUALIMAINE-Aufzuchtprogramme werden von Certipaq gemäß den in den Lastenheften vorgegebenen Kontrollplänen durchgeführt', - 'chargesLabel' => '', - 'chargesUrl' => '/cahiers-des-charges', + 'text1' => 'Die externen Kontrollen der QUALIMAINE-Aufzuchtprogramme werden von Certipaq gemäß den in den', + 'text1_1' => 'vorgegebenen Kontrollplänen durchgeführt', + 'chargesLabel' => 'Lastenheften', + 'chargesUrl' => '/de#aufzuchtstandards', 'text2' => 'Certipaq ist eine gem äß DIN EN ISO/IEC 17065 akkreditierte Zertifizierungsstelle.', 'text3' => 'Weitere Informationen unter', ], diff --git a/lang/fr/front.php b/lang/fr/front.php index d59b0e6..bb23c76 100644 --- a/lang/fr/front.php +++ b/lang/fr/front.php @@ -104,7 +104,7 @@ return [ 'title' => 'Contrôles indépendants', 'text1' => 'Certipaq réalise le contrôle externe des programmes d\'élevage QUALIMAINE selon des plans de contrôle associés aux', 'chargesLabel' => 'cahiers des charges', - 'chargesUrl' => '/cahiers-des-charges', + 'chargesUrl' => '/#normes-delevage', 'text2' => 'Certipaq est un organisme accrédité selon la norme ISO/CEI 17065.', 'text3' => 'Plus d\'informations sur', ], diff --git a/resources/ts/front/Components/ControlSection.tsx b/resources/ts/front/Components/ControlSection.tsx index 641c8ab..cb65c32 100644 --- a/resources/ts/front/Components/ControlSection.tsx +++ b/resources/ts/front/Components/ControlSection.tsx @@ -5,6 +5,8 @@ import euFlagWebp from "&/images/certifications/logo-eu.webp"; import useTrans from "@/hooks/use-translations"; export default function ControlsSection() { + const text1_1 = useTrans("front.controls.independentControls.text1_1"); + const hasText1_1 = text1_1 !== "front.controls.independentControls.text1_1"; return (
@@ -31,7 +33,7 @@ export default function ControlsSection() { > {useTrans("front.controls.independentControls.chargesLabel")} - . + {hasText1_1 ? ` ${text1_1}` : "."}

{useTrans("front.controls.independentControls.text2")} diff --git a/resources/ts/front/Components/EngagementSection.tsx b/resources/ts/front/Components/EngagementSection.tsx index 7903107..c7de3aa 100644 --- a/resources/ts/front/Components/EngagementSection.tsx +++ b/resources/ts/front/Components/EngagementSection.tsx @@ -13,6 +13,7 @@ import farmersJpg from "&/images/engagements/formation-eleveurs.jpg"; import farmersWebp from "&/images/engagements/formation-eleveurs.webp"; import monitoringJpg from "&/images/engagements/surveillance-renforcee.jpg"; import monitoringWebp from "&/images/engagements/surveillance-renforcee.webp"; +import useDeviceType from "@/hooks/use-device-type"; import { GetTranslation } from "@/lib/utils"; const ENGAGEMENTS = [ @@ -73,27 +74,20 @@ export default function EngagementsSection() { const scrollerRef = useRef(null); const cardRefs = useRef<(HTMLDivElement | null)[]>([]); const [activeIndex, setActiveIndex] = useState(0); + const { isMobile } = useDeviceType(); + + const visibleCount = isMobile ? 1 : 3; + const dotsCount = Math.max(ENGAGEMENTS.length - visibleCount + 1, 1); useEffect(() => { const scroller = scrollerRef.current; if (!scroller) return; const handleScroll = () => { - const scrollerCenter = scroller.scrollLeft + scroller.clientWidth / 2; - let closestIndex = 0; - let closestDistance = Infinity; - - cardRefs.current.forEach((card, index) => { - if (!card) return; - const cardCenter = card.offsetLeft + card.offsetWidth / 2; - const distance = Math.abs(cardCenter - scrollerCenter); - if (distance < closestDistance) { - closestDistance = distance; - closestIndex = index; - } - }); - - setActiveIndex(closestIndex); + const maxScroll = scroller.scrollWidth - scroller.clientWidth; + const ratio = maxScroll > 0 ? scroller.scrollLeft / maxScroll : 0; + const index = Math.round(ratio * (dotsCount - 1)); + setActiveIndex(index); }; scroller.addEventListener("scroll", handleScroll, { passive: true }); @@ -101,17 +95,15 @@ export default function EngagementsSection() { return () => { scroller.removeEventListener("scroll", handleScroll); }; - }, []); + }, [dotsCount]); const scrollToIndex = (index: number) => { - const clamped = (index + ENGAGEMENTS.length) % ENGAGEMENTS.length; + const clamped = Math.max(0, Math.min(index, dotsCount - 1)); const card = cardRefs.current[clamped]; const scroller = scrollerRef.current; if (!card || !scroller) return; - const targetLeft = - card.offsetLeft - (scroller.clientWidth - card.offsetWidth) / 2; - scroller.scrollTo({ left: targetLeft, behavior: "smooth" }); + scroller.scrollTo({ left: card.offsetLeft, behavior: "smooth" }); }; return ( @@ -195,14 +187,16 @@ export default function EngagementsSection() {

- {ENGAGEMENTS.map((_, index) => ( + {Array.from({ length: dotsCount }).map((_, index) => (
( )} rel="noreferrer" > - {str( - GetTranslation("uwil-common::cookie-notice.learn_more"), - ) + {str(GetTranslation("front.pages.privacyPolicy.pageTitle")) .ucFirst() .value()} diff --git a/resources/ts/front/Components/cookie/constants.tsx b/resources/ts/front/Components/cookie/constants.tsx index 84159e3..96c3050 100644 --- a/resources/ts/front/Components/cookie/constants.tsx +++ b/resources/ts/front/Components/cookie/constants.tsx @@ -97,7 +97,7 @@ export const mappingBtnSize = { export const positionBannerButton = { aside: { - left: "h-fit left-0 top-1/2 -translate-y-1/2 px-3 py-4 [writing-mode:vertical-rl] rounded-r-lg rounded-l-none", + left: "h-fit left-0 bottom-1 px-3 py-4 [writing-mode:vertical-rl] rounded-r-lg rounded-l-none", right: "h-fit right-0 top-1/2 -translate-y-1/2 px-3 py-4 [writing-mode:vertical-lr] rotate-180 rounded-r-lg rounded-l-none", }, diff --git a/resources/ts/front/Layouts/AppLayout.tsx b/resources/ts/front/Layouts/AppLayout.tsx index cfe38f6..680169e 100644 --- a/resources/ts/front/Layouts/AppLayout.tsx +++ b/resources/ts/front/Layouts/AppLayout.tsx @@ -1,7 +1,12 @@ import { usePage } from "@inertiajs/react"; import { type ReactNode } from "react"; -import { animations } from "../Components/cookie/constants"; +import useDeviceType from "@/hooks/use-device-type"; + +import { + animations, + positionBannerButton, +} from "../Components/cookie/constants"; import CookieNotice from "../Components/cookie/CookieNotice"; import { RecaptchaProvider } from "../Components/cookie/recaptcha/RecaptchaProvider"; import Footer from "../Components/Layout/Footer"; @@ -17,6 +22,7 @@ const HOME_COMPONENT = "front/Pages/Home"; export default function AppLayout({ children }: AppLayoutProps) { const { component } = usePage(); const isHome = component === HOME_COMPONENT; + const { isMobile } = useDeviceType(); return (