From e2c41561da0e20d8fd3aa963c55d47bf1ddbef4a Mon Sep 17 00:00:00 2001 From: mouad bouras Date: Tue, 24 Mar 2026 13:12:38 -0400 Subject: [PATCH] wip --- src/assets/cachet-hero-logo.svg | 5 +++++ src/components/header.tsx | 19 ++++++------------- src/components/ui/hero.tsx | 18 +++++++++++++----- src/content.config.ts | 3 +++ src/content/contact/fr/main.json | 4 +++- src/content/hero/fr/main.json | 3 ++- src/layouts/base.astro | 2 ++ src/pages/contact.astro | 4 ++-- src/pages/index.astro | 3 +-- 9 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 src/assets/cachet-hero-logo.svg diff --git a/src/assets/cachet-hero-logo.svg b/src/assets/cachet-hero-logo.svg new file mode 100644 index 0000000..62aacb2 --- /dev/null +++ b/src/assets/cachet-hero-logo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/header.tsx b/src/components/header.tsx index 161fba8..d956a97 100644 --- a/src/components/header.tsx +++ b/src/components/header.tsx @@ -3,6 +3,7 @@ import { Dialog, DialogPanel } from "@headlessui/react"; import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/outline"; import general from "../content/settings/general.json"; + export default function Header({ navigation, ctaLabel, @@ -23,24 +24,16 @@ export default function Header({
-
+
{general.siteName} {general.siteName}
- -

- {general.brandName} -

@@ -93,7 +86,7 @@ export default function Header({ {general.siteName} {general.siteName}
diff --git a/src/components/ui/hero.tsx b/src/components/ui/hero.tsx index 1b9c8c7..0c4e54e 100644 --- a/src/components/ui/hero.tsx +++ b/src/components/ui/hero.tsx @@ -10,10 +10,11 @@ import photo2 from "@/assets/photos/the-attic-of-a-home-with-white-ceilings-and- import photo3 from "@/assets/photos/silver-and-white-apartment-interior-2023-11-27-05-32-03-utc.webp"; import photo4 from "@/assets/photos/a-bedroom-with-white-walls-and-a-bed-and-a-2023-11-27-05-25-30-utc.webp"; import photo5 from "@/assets/photos/empty-room-with-window-2023-11-27-05-08-12-utc.webp"; - +import logo from "@/assets/cachet-hero-logo.svg"; export type HeroContent = { pillCta: string; title: string; + title2: string; subtitle: string; cta: string; ctaHref: string; @@ -28,13 +29,13 @@ const slides = [ ]; const autoplayPlugin = Autoplay({ - delay: 5000, + delay: 4000, stopOnInteraction: false, stopOnMouseEnter: false, }); export default function Hero({ content }: { content: HeroContent }) { - const { pillCta, title, subtitle, cta, ctaHref } = content; + const { pillCta, title, title2, subtitle, cta, ctaHref } = content; return (
@@ -59,7 +60,7 @@ export default function Hero({ content }: { content: HeroContent }) {
-
+
RBQ {general.rbq} @@ -73,12 +74,19 @@ export default function Hero({ content }: { content: HeroContent }) { {pillCta}
-

{title}

+

+ {title2} +

*/} + {general.siteName}

{subtitle}

diff --git a/src/content.config.ts b/src/content.config.ts index 741748e..7f9b0ef 100644 --- a/src/content.config.ts +++ b/src/content.config.ts @@ -42,6 +42,7 @@ const hero = defineCollection({ schema: z.object({ pillCta: z.string(), title: z.string(), + title2: z.string(), subtitle: z.string(), cta: z.string(), ctaHref: z.string(), @@ -87,6 +88,8 @@ const contact = defineCollection({ button: z.string(), }), breadcrumbHome: z.string(), + rbq: z.string(), + neq: z.string(), }), }); diff --git a/src/content/contact/fr/main.json b/src/content/contact/fr/main.json index fd9f4bd..321ec40 100644 --- a/src/content/contact/fr/main.json +++ b/src/content/contact/fr/main.json @@ -23,5 +23,7 @@ "description": "Obtenez une estimation personnalisée et gratuite pour votre projet de peinture ou décoration.", "button": "Soumission gratuite" }, - "breadcrumbHome": "Accueil" + "breadcrumbHome": "Accueil", + "rbq": "RBQ : ", + "neq": "NEQ : " } diff --git a/src/content/hero/fr/main.json b/src/content/hero/fr/main.json index 69eef9a..8eb6f72 100644 --- a/src/content/hero/fr/main.json +++ b/src/content/hero/fr/main.json @@ -1,6 +1,7 @@ { "pillCta": "Soumission gratuite", - "title": "Peintres Décorateurs à votre service", + "title": "CACHET", + "title2": "PEINTRES DÉCORATEURS", "subtitle": "Travaux de peinture résidentielle et commerciale, décoration intérieure et extérieure. Qualité professionnelle sur la Rive-Nord et Laval.", "cta": "Soumission gratuite", "ctaHref": "/soumission" diff --git a/src/layouts/base.astro b/src/layouts/base.astro index f70f5fd..9f15a15 100644 --- a/src/layouts/base.astro +++ b/src/layouts/base.astro @@ -4,6 +4,7 @@ import { getCollection } from 'astro:content'; import { getLocale } from '@/lib/locale'; import SEOHead from '@/components/seo-head.astro'; import Header from '@/components/header'; +import Footer from '@/components/footer.astro'; interface Props { title?: string; @@ -40,5 +41,6 @@ const navigationItems = nav.links.map((link) => ({ name: link.name, href: link.h
+
diff --git a/src/pages/contact.astro b/src/pages/contact.astro index 0e4a934..e273d51 100644 --- a/src/pages/contact.astro +++ b/src/pages/contact.astro @@ -118,8 +118,8 @@ const ctaImage = (await import('@/assets/Website Content/Photos/cozy-modern-kitc )}
-

RBQ : {general.rbq}

-

NEQ : {general.neq} ({general.legalName})

+

{contact.rbq} {general.rbq}

+

{contact.neq} {general.neq} ({general.legalName})

diff --git a/src/pages/index.astro b/src/pages/index.astro index 3238b57..02f8bb7 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -8,7 +8,6 @@ import Hero from '@/components/ui/hero'; import Services from '@/components/ui/services'; import WhyChooseUs from '@/components/ui/why-choose-us'; import CTABanner from '@/components/ui/cta-banner'; -import Footer from '@/components/footer.astro'; import Testimonials from '@/components/ui/testimonials'; const locale = getLocale(Astro); @@ -70,6 +69,7 @@ const features = services.map((service) => { const heroContent = { pillCta: heroData.pillCta, title: heroData.title, + title2: heroData.title2, subtitle: heroData.subtitle, cta: heroData.cta, ctaHref: heroData.ctaHref, @@ -114,5 +114,4 @@ const heroContent = { imageAlt={ctaData.imageAlt} /> -