diff --git a/public/images/empty-room-blue-wall-with-moulding-and-parquet-fl-2023-11-27-04-52-31-utc.webp b/public/images/carrousel-1.webp similarity index 100% rename from public/images/empty-room-blue-wall-with-moulding-and-parquet-fl-2023-11-27-04-52-31-utc.webp rename to public/images/carrousel-1.webp diff --git a/src/assets/photos/the-attic-of-a-home-with-white-ceilings-and-white-2023-11-27-05-27-44-utc.webp b/public/images/carrousel-2.webp similarity index 100% rename from src/assets/photos/the-attic-of-a-home-with-white-ceilings-and-white-2023-11-27-05-27-44-utc.webp rename to public/images/carrousel-2.webp diff --git a/src/assets/photos/silver-and-white-apartment-interior-2023-11-27-05-32-03-utc.webp b/public/images/carrousel-3.webp similarity index 100% rename from src/assets/photos/silver-and-white-apartment-interior-2023-11-27-05-32-03-utc.webp rename to public/images/carrousel-3.webp diff --git a/src/assets/photos/a-bedroom-with-white-walls-and-a-bed-and-a-2023-11-27-05-25-30-utc.webp b/public/images/carrousel-4.webp similarity index 100% rename from src/assets/photos/a-bedroom-with-white-walls-and-a-bed-and-a-2023-11-27-05-25-30-utc.webp rename to public/images/carrousel-4.webp diff --git a/src/assets/photos/empty-room-with-window-2023-11-27-05-08-12-utc.webp b/public/images/carrousel-5.webp similarity index 100% rename from src/assets/photos/empty-room-with-window-2023-11-27-05-08-12-utc.webp rename to public/images/carrousel-5.webp diff --git a/public/images/landing-cta.webp b/public/images/landing-cta.webp new file mode 100644 index 0000000..15a02eb Binary files /dev/null and b/public/images/landing-cta.webp differ diff --git a/src/assets/photos/empty-room-blue-wall-with-moulding-and-parquet-fl-2023-11-27-04-52-31-utc.webp b/public/images/services-1.webp similarity index 100% rename from src/assets/photos/empty-room-blue-wall-with-moulding-and-parquet-fl-2023-11-27-04-52-31-utc.webp rename to public/images/services-1.webp diff --git a/public/images/services-2.webp b/public/images/services-2.webp new file mode 100644 index 0000000..6259887 Binary files /dev/null and b/public/images/services-2.webp differ diff --git a/public/images/services-3.webp b/public/images/services-3.webp new file mode 100644 index 0000000..3247b49 Binary files /dev/null and b/public/images/services-3.webp differ diff --git a/public/images/services-4.webp b/public/images/services-4.webp new file mode 100644 index 0000000..fd1ed8e Binary files /dev/null and b/public/images/services-4.webp differ diff --git a/public/images/services-5.webp b/public/images/services-5.webp new file mode 100644 index 0000000..2235e91 Binary files /dev/null and b/public/images/services-5.webp differ diff --git a/public/images/short-hero.webp b/public/images/short-hero.webp new file mode 100644 index 0000000..698c44a Binary files /dev/null and b/public/images/short-hero.webp differ diff --git a/public/images/stylish-bedroom-interior-with-double-bed-and-emera-2023-11-27-05-08-37-utc.webp b/public/images/submission.webp similarity index 100% rename from public/images/stylish-bedroom-interior-with-double-bed-and-emera-2023-11-27-05-08-37-utc.webp rename to public/images/submission.webp diff --git a/src/assets/photos/carrousel-1.webp b/src/assets/photos/carrousel-1.webp new file mode 100644 index 0000000..698c44a Binary files /dev/null and b/src/assets/photos/carrousel-1.webp differ diff --git a/src/assets/photos/carrousel-2.webp b/src/assets/photos/carrousel-2.webp new file mode 100644 index 0000000..6259887 Binary files /dev/null and b/src/assets/photos/carrousel-2.webp differ diff --git a/src/assets/photos/carrousel-3.webp b/src/assets/photos/carrousel-3.webp new file mode 100644 index 0000000..3247b49 Binary files /dev/null and b/src/assets/photos/carrousel-3.webp differ diff --git a/src/assets/photos/carrousel-4.webp b/src/assets/photos/carrousel-4.webp new file mode 100644 index 0000000..fd1ed8e Binary files /dev/null and b/src/assets/photos/carrousel-4.webp differ diff --git a/src/assets/photos/carrousel-5.webp b/src/assets/photos/carrousel-5.webp new file mode 100644 index 0000000..2235e91 Binary files /dev/null and b/src/assets/photos/carrousel-5.webp differ diff --git a/src/assets/photos/rough-cement-texture-background-material-wet-conc-2023-11-27-05-10-06-utc.webp b/src/assets/photos/rough-cement-texture-background-material-wet-conc-2023-11-27-05-10-06-utc.webp deleted file mode 100644 index 6be3dc6..0000000 Binary files a/src/assets/photos/rough-cement-texture-background-material-wet-conc-2023-11-27-05-10-06-utc.webp and /dev/null differ diff --git a/src/assets/photos/services-1.webp b/src/assets/photos/services-1.webp new file mode 100644 index 0000000..698c44a Binary files /dev/null and b/src/assets/photos/services-1.webp differ diff --git a/src/assets/photos/services-2.webp b/src/assets/photos/services-2.webp new file mode 100644 index 0000000..6259887 Binary files /dev/null and b/src/assets/photos/services-2.webp differ diff --git a/src/assets/photos/services-3.webp b/src/assets/photos/services-3.webp new file mode 100644 index 0000000..3247b49 Binary files /dev/null and b/src/assets/photos/services-3.webp differ diff --git a/src/assets/photos/services-4.webp b/src/assets/photos/services-4.webp new file mode 100644 index 0000000..fd1ed8e Binary files /dev/null and b/src/assets/photos/services-4.webp differ diff --git a/src/assets/photos/services-5.webp b/src/assets/photos/services-5.webp new file mode 100644 index 0000000..2235e91 Binary files /dev/null and b/src/assets/photos/services-5.webp differ diff --git a/src/components/submission.tsx b/src/components/submission.tsx index 6addfaa..b3bfd04 100644 --- a/src/components/submission.tsx +++ b/src/components/submission.tsx @@ -179,17 +179,9 @@ export default function SubmissionForm({ imageSrc, imageAlt, title, subtitle, fo const totalSize = uploadedFiles.reduce((sum, f) => sum + f.size, 0); return ( -
-
- {imageAlt} -
-
-
-
+
+
+
{submitStatus === "success" ? (
@@ -414,6 +406,13 @@ export default function SubmissionForm({ imageSrc, imageAlt, title, subtitle, fo )}
+ +
+ {imageAlt}
); diff --git a/src/components/ui/contact.tsx b/src/components/ui/contact.tsx index a324c6a..6fbaabe 100644 --- a/src/components/ui/contact.tsx +++ b/src/components/ui/contact.tsx @@ -38,7 +38,7 @@ export default function Contact({ const labelClass = 'block text-sm/6 font-semibold text-brand-dark dark:text-white' return ( -
+
diff --git a/src/components/ui/hero.tsx b/src/components/ui/hero.tsx index e0f31cf..c20224d 100644 --- a/src/components/ui/hero.tsx +++ b/src/components/ui/hero.tsx @@ -5,11 +5,7 @@ import { } from "@/components/ui/carousel"; import Autoplay from "embla-carousel-autoplay"; import general from "../../content/settings/general.json"; -import photo1 from "@/assets/photos/empty-room-blue-wall-with-moulding-and-parquet-fl-2023-11-27-04-52-31-utc.webp"; -import photo2 from "@/assets/photos/the-attic-of-a-home-with-white-ceilings-and-white-2023-11-27-05-27-44-utc.webp"; -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 = { @@ -21,11 +17,11 @@ export type HeroContent = { }; const slides = [ - { src: photo1.src, alt: "Peinture intérieure" }, - { src: photo2.src, alt: "Décoration murale" }, - { src: photo3.src, alt: "Finition de qualité" }, - { src: photo4.src, alt: "Chambre" }, - { src: photo5.src, alt: "Pièce lumineuse" }, + { src: '/images/carrousel-1.webp', alt: "Peinture intérieure" }, + { src: '/images/carrousel-2.webp', alt: "Décoration murale" }, + { src: '/images/carrousel-3.webp', alt: "Finition de qualité" }, + { src: '/images/carrousel-4.webp', alt: "Chambre" }, + { src: '/images/carrousel-5.webp', alt: "Pièce lumineuse" }, ]; const autoplayPlugin = Autoplay({ diff --git a/src/components/ui/short-hero.tsx b/src/components/ui/short-hero.tsx index 668b62e..26df58f 100644 --- a/src/components/ui/short-hero.tsx +++ b/src/components/ui/short-hero.tsx @@ -15,7 +15,7 @@ interface ContactHeroContent {
{imageAlt}
diff --git a/src/pages/contact.astro b/src/pages/contact.astro index 1812926..197f1cb 100644 --- a/src/pages/contact.astro +++ b/src/pages/contact.astro @@ -24,7 +24,7 @@ const contact = contactEntry.data; content={{ title: contact.title, subtitle: contact.subtitle, - imageSrc: "/images/empty-room-blue-wall-with-moulding-and-parquet-fl-2023-11-27-04-52-31-utc.webp", + imageSrc: "/images/short-hero.webp", imageAlt: "Peintres décorateurs au travail", }} /> diff --git a/src/pages/index.astro b/src/pages/index.astro index b38c1c5..4634bef 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -28,30 +28,34 @@ const ctaData = ctaEntry.data; const pourquoiData = pourquoiEntry.data; const testimonialsData = testimonialsEntry.data; -const ctaImage = (await import('@/assets/Website Content/Photos/cozy-modern-kitchen-room-interior-design-with-dark-2024-04-01-23-13-59-utc.webp')).default; +const ctaImage = +{ + src: '/images/landing-cta.webp', + alt: 'Peintres décorateurs au travail', +}; const allServices = await getCollection('services', (s) => s.id.startsWith(`${locale}/`)); const services = allServices.sort((a, b) => a.data.order - b.data.order); -const serviceImages: Record = { +const serviceImages: Record = { interior: { - src: (await import('@/assets/photos/empty-room-blue-wall-with-moulding-and-parquet-fl-2023-11-27-04-52-31-utc.webp')).default, + src: '/images/services-1.webp', alt: 'Salon avec peinture intérieure soignée', }, exterior: { - src: (await import('@/assets/Website Content/Photos/wooden-deck-with-sky-2023-11-27-05-29-44-utc.webp')).default, + src: '/images/services-2.webp', alt: 'Maison avec peinture extérieure', }, commercial: { - src: (await import('@/assets/Website Content/Photos/minimalist-bright-office-room-interior-design-mee-2023-11-27-05-17-04-utc.webp')).default, + src: '/images/services-3.webp', alt: 'Espace commercial peint', }, decoration: { - src: (await import('@/assets/Website Content/Photos/Mural_Jerkspot_02.jpg')).default, + src: '/images/services-4.webp', alt: 'Décoration intérieure et murale', }, renovation: { - src: (await import('@/assets/Website Content/Photos/amazing-design-of-a-room-with-doors-and-parquet-fl-2023-11-27-05-33-04-utc.webp')).default, + src: '/images/services-5.webp', alt: 'Rénovation et finitions', }, }; @@ -59,11 +63,10 @@ const serviceImages: Record { const icon = service.data.icon ?? 'interior'; const img = serviceImages[icon] ?? serviceImages.interior; - const imageSrc = (img.src as import('astro').ImageMetadata).src; return { name: service.data.title, description: service.data.description, - imageSrc, + imageSrc: img.src , imageAlt: img.alt, }; }); diff --git a/src/pages/soumission.astro b/src/pages/soumission.astro index a57150a..8f2349b 100644 --- a/src/pages/soumission.astro +++ b/src/pages/soumission.astro @@ -24,15 +24,15 @@ const soumission = soumissionEntry.data; content={{ title: soumission.title, subtitle: soumission.subtitle, - imageSrc: "/images/empty-room-blue-wall-with-moulding-and-parquet-fl-2023-11-27-04-52-31-utc.webp", + imageSrc: "/images/short-hero.webp", imageAlt: "Peintres décorateurs au travail", }} />