Packages and banners from the CMS, host injection, translation files and the contact form #19

Merged
Sluijsens merged 44 commits from feature/asf-packages-cms into master 2026-11-16 14:17:14 +01:00
16 changed files with 57 additions and 87 deletions
Showing only changes of commit b2cb6351e1 - Show all commits
@@ -832,16 +832,6 @@ p:last-child { margin-bottom: 0; }
.price-card .btn { align-self: center; margin-top: auto; }
/* Decoratieve illustraties uit het thema */
.pricing__deco {
position: absolute;
z-index: 0;
width: clamp(90px, 10vw, 160px);
opacity: .55;
pointer-events: none;
}
.pricing__deco--1 { top: 8%; left: 2%; }
.pricing__deco--2 { bottom: 6%; right: 3%; }
.pricing .container { position: relative; z-index: 1; }
/* ==========================================================================
Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

@@ -47,6 +47,4 @@ portfolio-8.jpg https://andreaslop.nl/wp-content/uploads/2026/04/F41A7284_websiz
# --- Lieve woorden: hergebruikt hero-5.jpg (Trouwshoot) en portfolio-6.jpg (Newbornshoot) ---
# --- Decoratie prijzensectie ---
deco-1.png https://andreaslop.nl/wp-content/uploads/2020/01/landing-img-18.png
deco-2.png https://andreaslop.nl/wp-content/uploads/2020/01/h1-img-16.png
# --- Decoratie prijzensectie: weggelaten (themabeelden, licentie; zie docs/assets-and-licenses.md) ---
-2
View File
@@ -181,8 +181,6 @@
<!-- ======================================================= Prijzen -->
<section class="section pricing">
<img class="pricing__deco pricing__deco--1" src="assets/img/deco-1.png" alt="" aria-hidden="true" loading="lazy">
<img class="pricing__deco pricing__deco--2" src="assets/img/deco-2.png" alt="" aria-hidden="true" loading="lazy">
<div class="container">
<div class="section__head section__head--center reveal">
+17
View File
@@ -0,0 +1,17 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 143 112" width="143" height="112" fill="none" stroke="#7f8b76" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
<path d="M6 100 C40 92 80 60 128 22"/>
<path d="M25.0 93.5 C38.1 90.9 41.8 75.7 33.0 68.7 C21.8 69.2 15.9 83.6 25.0 93.5 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M42.8 84.2 C45.4 96.0 59.4 99.4 65.7 91.6 C65.1 81.6 51.7 76.2 42.8 84.2 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M64.2 70.6 C75.2 66.5 75.9 53.3 67.0 48.8 C57.3 50.8 54.6 63.8 64.2 70.6 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M86.9 54.1 C90.1 64.0 102.0 65.4 106.5 57.9 C105.1 49.3 93.5 46.1 86.9 54.1 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M108.3 37.6 C116.4 33.6 116.3 22.8 109.5 19.6 C102.3 21.8 100.8 32.5 108.3 37.6 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M128.0 22.0 C135.5 25.0 142.7 18.4 140.7 11.9 C134.9 8.5 126.8 14.0 128.0 22.0 Z" fill="#7f8b76" fill-opacity=".10"/>
<g stroke-width="1" opacity=".7">
<path d="M25.0 93.5 L30.6 76.2"/>
<path d="M42.8 84.2 L58.8 89.4"/>
<path d="M64.2 70.6 L66.2 55.3"/>
<path d="M86.9 54.1 L100.7 56.7"/>
<path d="M108.3 37.6 L109.2 25.0"/>
<path d="M128.0 22.0 L136.9 15.0"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

+23
View File
@@ -0,0 +1,23 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 239 224" width="239" height="224" fill="none" stroke="#7f8b76" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
<path d="M12 214 C60 196 120 140 214 26"/>
<path d="M26.8 207.4 C41.2 199.0 39.2 186.1 35.6 174.6 C26.7 182.8 18.6 192.9 26.8 207.4 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M42.4 198.5 C46.9 215.9 68.1 220.3 77.1 208.2 C75.7 193.2 55.3 185.9 42.4 198.5 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M60.8 185.7 C73.4 174.9 69.3 162.6 63.7 151.8 C56.3 161.4 50.1 172.8 60.8 185.7 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M80.5 169.7 C86.9 186.3 107.4 187.3 114.2 174.0 C110.9 159.4 90.9 155.3 80.5 169.7 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M101.7 150.4 C113.1 138.8 107.5 127.8 100.8 118.4 C94.6 128.2 89.7 139.5 101.7 150.4 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M124.7 127.5 C131.7 142.1 149.7 141.3 154.7 128.6 C150.6 115.5 132.7 113.5 124.7 127.5 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M149.5 100.9 C159.0 90.1 153.4 80.9 146.7 73.1 C141.8 82.0 138.1 92.2 149.5 100.9 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M176.5 70.5 C182.7 80.8 197.0 79.5 200.5 70.0 C196.7 60.8 182.3 60.0 176.5 70.5 Z" fill="#7f8b76" fill-opacity=".10"/>
<path d="M214.0 26.0 C224.7 27.8 232.2 17.2 227.7 9.3 C219.2 6.5 210.2 15.9 214.0 26.0 Z" fill="#7f8b76" fill-opacity=".10"/>
<g stroke-width="1" opacity=".7">
<path d="M26.8 207.4 L32.9 184.5"/>
<path d="M42.4 198.5 L66.7 205.3"/>
<path d="M60.8 185.7 L62.8 162.0"/>
<path d="M80.5 169.7 L104.1 172.7"/>
<path d="M101.7 150.4 L101.0 128.0"/>
<path d="M124.7 127.5 L145.7 128.3"/>
<path d="M149.5 100.9 L147.6 81.4"/>
<path d="M176.5 70.5 L193.3 70.2"/>
<path d="M214.0 26.0 L223.6 14.3"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

+5 -1
View File
@@ -4,7 +4,11 @@ Where the images, icons and fonts of the site come from. Status "owner" means ma
Last checked: 2026-11-15.
## Decorative twigs on the home page (to confirm: probably from the paid WordPress theme)
## Decorative twigs on the home page: removed (theme images, licence)
Status 2026-11-15 (decision of Bryan): left out. `deco-1.png` and `deco-2.png` are removed from the site (Pricing section and the banner under the cards) and from the repo, including the copies in `design/andreaslop-static/assets/img` (with their `<img>` tags, the `.pricing__deco` CSS and the manifest lines there). The reason is the licence below. Own replacements are kept in reserve and not built in: two SVG line drawings in the brand green, `design/own-assets/twig-1.svg` and `twig-2.svg` (drawn for this project, free of rights, not used by the site) and the options public-domain illustrations or a commissioned illustration. The site works without them: no empty space and no shifting (checked on desktop and phone, with and without banners). The earlier commits still contain the PNG files in the git history; they are not in the working tree or in any new build.
The record of what they were:
| File | Used by | Source recorded in the repo |
| -------------------------------------------- | --------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
+6 -6
View File
@@ -21,12 +21,12 @@ Source: `GET /api/v1/offerings`. One list feeds the price cards on the home page
Source: `GET /api/v1/offerings/banner?position=top|bottom`. No parameter means `bottom`; `204` means no active banner; an invalid value is `400`. Answer fields: `title` (at most 100 characters), `text` (at most 300 for bottom, 120 for top), `linkLabel`, `linkUrl` (both or neither; `https://` or a path on the site with one `/`) and `position`. Both banners may be active and visible at the same time.
| | Under the cards (`bottom`) | Above the cards (`top`) |
| --------- | ---------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
| Component | `PriceBanner` | `PriceTopBar` |
| Look | Light band, thin heidegroen top rule, section-heading title, ornament, sprig, deep-green link button | Slim white bar, same hairline and top rule, one line: small capitals title, diamond, text, small underlined link |
| Required | title | title or text (title may be empty) |
| Mapping | `mapBanner` | `mapTopBanner` |
| | Under the cards (`bottom`) | Above the cards (`top`) |
| --------- | --------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
| Component | `PriceBanner` | `PriceTopBar` |
| Look | Light band, thin heidegroen top rule, section-heading title, ornament, deep-green link button | Slim white bar, same hairline and top rule, one line: small capitals title, diamond, text, small underlined link |
| Required | title | title or text (title may be empty) |
| Mapping | `mapBanner` | `mapTopBanner` |
Both follow the same rules as the packages: baked into the HTML at build time, replaced live after hydration, empty fields are hidden, an error or invalid answer keeps what was baked. A `204` hides that banner (the one deliberate exception to "keep what was baked"); the two banners are independent of each other. Neither banner is a package: not in the form choices, not in the package count.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

@@ -1,6 +1,5 @@
import { Box, Heading, Text, useRecipe } from '@chakra-ui/react';
import DeferredImage from '@/components/DeferredImage/DeferredImage';
import type { ContentImage, PricingBanner } from '@/content/types';
import type { PricingBanner } from '@/content/types';
// white: the white of the price cards; green: a very light heidegroen tint
export type BannerTone = 'white' | 'green';
@@ -14,23 +13,19 @@ const TONES: Record<BannerTone, { bg: string }> = {
type PriceBannerProps = {
banner: PricingBanner;
// The eucalyptus sprig of the section, as a quiet corner decoration
decoration?: ContentImage;
tone?: BannerTone;
};
// The optional band under the price cards: an announcement from the CMS (an
// offer, a notice), in the ASF look: light, a thin heidegroen rule on top,
// the section-heading type (Marcellus in spaced capitals), a small ornament
// between title and text, the botanical sprig in a corner and, when there is
// a link, the deep-green button of the cards. It is not a bookable package
// between title and text and, when there is a link, the deep-green button of the cards. It is not a bookable package
// and cannot be dismissed. Only the title is required; the text and the
// button are left out when empty. The link is a https address or a path on
// this site (the CMS guarantees that, mapBanner checks it again), so a plain
// anchor is enough.
export default function PriceBanner({
banner,
decoration,
tone = 'white',
}: PriceBannerProps) {
const linkButton = useRecipe({ key: 'linkButton' });
@@ -54,20 +49,6 @@ export default function PriceBanner({
borderTopColor="accent"
textAlign="center"
>
{decoration && (
<DeferredImage
image={decoration}
aria-hidden="true"
position="absolute"
top="0"
left="0"
zIndex={-1}
w="clamp(70px, 9vw, 130px)"
h="auto"
opacity={0.7}
pointerEvents="none"
/>
)}
<Heading
as="h3"
id="price-banner-title"
@@ -180,18 +180,11 @@ describe('Pricing', () => {
);
});
it('keeps the decorations away from assistive technology', async () => {
it('shows no images: the section has no decoration', async () => {
const { container } = await renderWithProviders(
<Pricing content={content} packages={packages} />,
);
// The only images here are the decorations: empty alt and aria-hidden
expect(screen.queryAllByRole('img')).toHaveLength(0);
const images = container.querySelectorAll('img');
expect(images).toHaveLength(content.decorations.length);
images.forEach((image) => {
expect(image).toHaveAttribute('alt', '');
expect(image).toHaveAttribute('aria-hidden', 'true');
});
expect(container.querySelectorAll('img')).toHaveLength(0);
});
it('skips invalid packages', async () => {
+1 -28
View File
@@ -1,6 +1,5 @@
import { Box, Flex } from '@chakra-ui/react';
import CmsRegion from '@/components/CmsRegion/CmsRegion';
import DeferredImage from '@/components/DeferredImage/DeferredImage';
import PageSection from '@/components/PageSection/PageSection';
import Reveal from '@/components/Reveal/Reveal';
import SectionHeading from '@/components/SectionHeading/SectionHeading';
@@ -19,15 +18,6 @@ import PriceTopBar from './PriceTopBar';
const TITLE_ID = 'pricing-title';
const STAGGER = 0.08;
// Where the two decorations sit (design .pricing__deco--1 and --2). The
// design measures from the whole section; here they sit in the content box,
// so the second one moves down into the section's bottom padding, or the
// last card would cover it.
const decorationPositions = [
{ top: '8%', left: '2%' },
{ bottom: 'calc(-0.6 * {spacing.sectionY})', right: '2%' },
];
type PricingProps = {
content: HomeContent['pricing'];
packages: PricingPackage[];
@@ -58,20 +48,6 @@ export default function Pricing({
data-testid="pricing"
>
<Box position="relative" isolation="isolate">
{content.decorations.map((decoration, index) => (
<DeferredImage
key={decoration.src}
image={decoration}
aria-hidden="true"
position="absolute"
zIndex={-1}
w="clamp(90px, 10vw, 160px)"
h="auto"
opacity={0.55}
pointerEvents="none"
{...decorationPositions[index % 2]}
/>
))}
<Reveal>
<SectionHeading
id={TITLE_ID}
@@ -125,10 +101,7 @@ export default function Pricing({
>
{banner && (
<Reveal>
<PriceBanner
banner={banner}
decoration={content.decorations[0]}
/>
<PriceBanner banner={banner} />
</Reveal>
)}
</CmsRegion>
-6
View File
@@ -6,8 +6,6 @@ import intro2 from '../assets/home/intro-2.jpg';
import intro3 from '../assets/home/intro-3.jpg';
import intro4 from '../assets/home/intro-4.jpg';
import andrea from '../assets/home/andrea.jpg';
import deco1 from '../assets/home/deco-1.png';
import deco2 from '../assets/home/deco-2.png';
// Shared by the intro gallery and the Instagram tiles, so one photo keeps
// one description
@@ -65,10 +63,6 @@ const homeContent: HomeContent = {
pricing: {
title: 'Prijzen',
lead: 'Pakketten',
decorations: [
{ src: deco1, alt: '', width: 143, height: 112 },
{ src: deco2, alt: '', width: 239, height: 224 },
],
},
testimonials: {
title: 'Lieve woorden',
-1
View File
@@ -188,7 +188,6 @@ export interface HomeContent {
title: string;
lead: string;
// Purely decorative illustrations, alt=""
decorations: ContentImage[];
};
testimonials: {
title: string;