Adds the Soorten fotoshoots page
Replaces the placeholder with the five shoot types (Newborn, Zwangerschap, Gezin, Loveshoot, Portretten), each an article with its own anchor, photo, text and a link to the contact form that preselects the matching package. A portfolio link per shoot shows once the portfolio page is live. A closing call to action links to the prices and the contact form. The page is indexed with its own description and preview image, and describes the shoots as services of the business in structured data. That data is rendered in the page component, so the shoot texts stay out of the main bundle. The shoot photos are cropped at 848x1060, no longer upscaled. Photo pages get a mobile Lighthouse performance target of 0.85: their largest paint is a photo that the simulated slow connection only requests after the scripts have run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@@ -163,6 +163,69 @@ describe('app', () => {
|
||||
expect(await axeResults(container)).toHaveNoViolations();
|
||||
});
|
||||
|
||||
it('shows the shoot types page with its outline, links and structured data', async () => {
|
||||
const { container } = await renderApp('/soorten-fotoshoots');
|
||||
await screen.findByRole('heading', {
|
||||
level: 1,
|
||||
name: 'Soorten fotoshoots',
|
||||
});
|
||||
const main = screen.getByRole('main');
|
||||
expect(
|
||||
within(main)
|
||||
.getAllByRole('heading')
|
||||
.map((h) => `${h.tagName} ${h.textContent}`),
|
||||
).toEqual([
|
||||
'H1 Soorten fotoshoots',
|
||||
'H2 Newborn',
|
||||
'H2 Zwangerschap',
|
||||
'H2 Gezin',
|
||||
'H2 Loveshoot',
|
||||
'H2 Portretten',
|
||||
'H2 Benieuwd naar de prijzen?',
|
||||
]);
|
||||
expect(
|
||||
within(main)
|
||||
.getAllByRole('article')
|
||||
.map((article) => article.id),
|
||||
).toEqual(['newborn', 'zwangerschap', 'gezin', 'loveshoot', 'portret']);
|
||||
expect(
|
||||
within(main)
|
||||
.getAllByRole('link', { name: /^Stuur een berichtje/ })
|
||||
.map((link) => link.getAttribute('href')),
|
||||
).toEqual([
|
||||
'/?pakket=newborn#contact',
|
||||
'/?pakket=zwangerschap#contact',
|
||||
'/?pakket=gezin#contact',
|
||||
'/#contact',
|
||||
'/#contact',
|
||||
]);
|
||||
// The portfolio is still a placeholder: no links to it yet
|
||||
expect(
|
||||
within(main).queryAllByRole('link', { name: /^Bekijk meer/ }),
|
||||
).toHaveLength(0);
|
||||
expect(
|
||||
screen.getByRole('link', { name: 'de pakketten' }),
|
||||
).toHaveAttribute('href', '/#prijzen');
|
||||
expect(
|
||||
screen.getByRole('link', { name: 'Boek je shoot' }),
|
||||
).toHaveAttribute('href', '/#contact');
|
||||
|
||||
expect(document.title).toBe(
|
||||
'Soorten fotoshoots | Andrea Slop Fotografie',
|
||||
);
|
||||
expect(document.head.querySelector('meta[name="robots"]')).toBeNull();
|
||||
const data = [
|
||||
...document.querySelectorAll('script[type="application/ld+json"]'),
|
||||
].map((script) => JSON.parse(script.textContent!));
|
||||
expect(data.map((item) => item['@type']).sort()).toEqual([
|
||||
'ProfessionalService',
|
||||
'WebPage',
|
||||
]);
|
||||
const page = data.find((item) => item['@type'] === 'WebPage');
|
||||
expect(page.mainEntity.itemListElement).toHaveLength(5);
|
||||
expect(await axeResults(container)).toHaveNoViolations();
|
||||
});
|
||||
|
||||
it('toont een onbekende URL als 404 binnen de shell', async () => {
|
||||
const { container } = await renderApp('/bestaat-niet');
|
||||
expect(
|
||||
|
||||
|
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 116 KiB |
|
Before Width: | Height: | Size: 183 KiB After Width: | Height: | Size: 152 KiB |
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 96 KiB |
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 103 KiB |
@@ -0,0 +1,75 @@
|
||||
import { screen, within } from '@testing-library/react';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import packages from '@/content/packages';
|
||||
import shootTypes from '@/content/shootTypes';
|
||||
import { axeResults } from '@/test/axe';
|
||||
import { renderWithProviders } from '@/test/renderWithProviders';
|
||||
import ShootBlock from './ShootBlock';
|
||||
|
||||
const shoot = (id: string) => shootTypes.find((item) => item.id === id)!;
|
||||
|
||||
const renderBlock = (
|
||||
id: string,
|
||||
{ portfolioLive = false, reverse = false, priority = false } = {},
|
||||
) =>
|
||||
renderWithProviders(
|
||||
<ShootBlock
|
||||
shoot={shoot(id)}
|
||||
packages={packages}
|
||||
reverse={reverse}
|
||||
priority={priority}
|
||||
portfolioLive={portfolioLive}
|
||||
/>,
|
||||
);
|
||||
|
||||
describe('ShootBlock', () => {
|
||||
it('is an article named by its heading, with the anchor id', async () => {
|
||||
const { container } = await renderBlock('newborn');
|
||||
const article = screen.getByRole('article', { name: 'Newborn' });
|
||||
expect(article).toHaveAttribute('id', 'newborn');
|
||||
expect(
|
||||
within(article).getByRole('heading', { level: 2 }),
|
||||
).toHaveTextContent('Newborn');
|
||||
expect(within(article).getByRole('img')).toHaveAccessibleName(
|
||||
shoot('newborn').image.alt,
|
||||
);
|
||||
expect(
|
||||
within(article).getByText(/De fotoshoot vindt bij jou thuis/),
|
||||
).toBeInTheDocument();
|
||||
expect(await axeResults(container)).toHaveNoViolations();
|
||||
});
|
||||
|
||||
it('links to the contact form with the package preselected', async () => {
|
||||
await renderBlock('zwangerschap');
|
||||
const link = screen.getByRole('link', {
|
||||
name: 'Stuur een berichtje over een zwangerschapsshoot',
|
||||
});
|
||||
expect(link).toHaveAttribute('href', '/?pakket=zwangerschap#contact');
|
||||
});
|
||||
|
||||
it('links to the contact form without a package when the shoot has none', async () => {
|
||||
await renderBlock('loveshoot');
|
||||
expect(
|
||||
screen.getByRole('link', {
|
||||
name: 'Stuur een berichtje over een loveshoot',
|
||||
}),
|
||||
).toHaveAttribute('href', '/#contact');
|
||||
});
|
||||
|
||||
it('only links to the portfolio once it is live', async () => {
|
||||
await renderBlock('portret');
|
||||
expect(screen.queryByTestId('shoot-portret-portfolio')).toBeNull();
|
||||
});
|
||||
|
||||
it('links to the portfolio filtered on the shoot type when live', async () => {
|
||||
await renderBlock('portret', { portfolioLive: true });
|
||||
expect(
|
||||
screen.getByRole('link', { name: "Bekijk meer portretfoto's" }),
|
||||
).toHaveAttribute('href', '/portfolio?shoot=portret');
|
||||
});
|
||||
|
||||
it('loads a priority photo straight away and others lazily', async () => {
|
||||
await renderBlock('newborn', { priority: true });
|
||||
expect(screen.getByRole('img')).not.toHaveAttribute('loading', 'lazy');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,89 @@
|
||||
import { Box, Flex, Heading, Link, Stack, Text } from '@chakra-ui/react';
|
||||
// The router's own Link keeps the route types, so `search` is checked
|
||||
// against the target route (as on the price cards)
|
||||
import { Link as RouterLink } from '@tanstack/react-router';
|
||||
import MediaText from '@/components/MediaText/MediaText';
|
||||
import type { PricingPackage, ShootType } from '@/content/types';
|
||||
import { shootContactLink, shootPortfolioLink } from '@/lib/shootLinks';
|
||||
|
||||
type ShootBlockProps = {
|
||||
shoot: ShootType;
|
||||
packages: readonly PricingPackage[];
|
||||
// Photo in the right-hand column from `lg`
|
||||
reverse: boolean;
|
||||
// The first photo on the page loads straight away
|
||||
priority: boolean;
|
||||
// Show "Bekijk meer …foto's" (BR-SF-04)
|
||||
portfolioLive: boolean;
|
||||
};
|
||||
|
||||
// Links in the text column: room around them for a 44px touch target
|
||||
const linkStyle = { py: 2.5, display: 'inline-block' } as const;
|
||||
|
||||
// One kind of shoot (design .shoot): its photo next to the name, the text
|
||||
// and the links. The article is the anchor (#newborn) and is named by its
|
||||
// heading.
|
||||
export default function ShootBlock({
|
||||
shoot,
|
||||
packages,
|
||||
reverse,
|
||||
priority,
|
||||
portfolioLive,
|
||||
}: ShootBlockProps) {
|
||||
const titleId = `shoot-${shoot.id}-title`;
|
||||
|
||||
return (
|
||||
<Box
|
||||
as="article"
|
||||
id={shoot.id}
|
||||
aria-labelledby={titleId}
|
||||
// An anchor lands right below the fixed header
|
||||
scrollMarginTop="header.sticky"
|
||||
data-testid={`shoot-${shoot.id}`}
|
||||
>
|
||||
<MediaText
|
||||
image={shoot.image}
|
||||
aspectRatio="4 / 5"
|
||||
frameColor={shoot.frameColor}
|
||||
reverse={reverse}
|
||||
priority={priority}
|
||||
>
|
||||
<Heading as="h2" id={titleId} textStyle="sectionTitle" mb={5}>
|
||||
{shoot.name}
|
||||
</Heading>
|
||||
<Stack gap={4} color="ink.soft">
|
||||
{shoot.paragraphs.map((paragraph) => (
|
||||
<Text key={paragraph}>{paragraph}</Text>
|
||||
))}
|
||||
</Stack>
|
||||
<Flex wrap="wrap" columnGap={6} mt={3}>
|
||||
<Link variant="underline" asChild {...linkStyle}>
|
||||
{/* Five links say "Stuur een berichtje"; the full name
|
||||
tells screen reader users which shoot each is about.
|
||||
It starts with the visible text, so voice control
|
||||
still finds it (BR-SF-06). An aria-label, because
|
||||
accessible names drop the leading space of a
|
||||
visually hidden span. */}
|
||||
<RouterLink
|
||||
{...shootContactLink(shoot, packages)}
|
||||
aria-label={`Stuur een berichtje over een ${shoot.shootLabel.toLowerCase()}`}
|
||||
data-testid={`shoot-${shoot.id}-contact`}
|
||||
>
|
||||
Stuur een berichtje
|
||||
</RouterLink>
|
||||
</Link>
|
||||
{portfolioLive && (
|
||||
<Link variant="underline" asChild {...linkStyle}>
|
||||
<RouterLink
|
||||
{...shootPortfolioLink(shoot)}
|
||||
data-testid={`shoot-${shoot.id}-portfolio`}
|
||||
>
|
||||
Bekijk meer {shoot.photosLabel}
|
||||
</RouterLink>
|
||||
</Link>
|
||||
)}
|
||||
</Flex>
|
||||
</MediaText>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
import { screen } from '@testing-library/react';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import packages from '@/content/packages';
|
||||
import shootTypes from '@/content/shootTypes';
|
||||
import { axeResults } from '@/test/axe';
|
||||
import { cssRulesFor } from '@/test/cssRules';
|
||||
import { renderWithProviders } from '@/test/renderWithProviders';
|
||||
import ShootList from './ShootList';
|
||||
|
||||
const renderList = () =>
|
||||
renderWithProviders(
|
||||
<ShootList
|
||||
shoots={shootTypes}
|
||||
packages={packages}
|
||||
portfolioLive={false}
|
||||
/>,
|
||||
);
|
||||
|
||||
describe('ShootList', () => {
|
||||
it('shows the shoots in order, each named by its heading', async () => {
|
||||
const { container } = await renderList();
|
||||
expect(
|
||||
screen.getAllByRole('article').map((article) => article.id),
|
||||
).toEqual(['newborn', 'zwangerschap', 'gezin', 'loveshoot', 'portret']);
|
||||
expect(
|
||||
screen
|
||||
.getAllByRole('heading', { level: 2 })
|
||||
.map((heading) => heading.textContent),
|
||||
).toEqual([
|
||||
'Newborn',
|
||||
'Zwangerschap',
|
||||
'Gezin',
|
||||
'Loveshoot',
|
||||
'Portretten',
|
||||
]);
|
||||
expect(await axeResults(container)).toHaveNoViolations();
|
||||
});
|
||||
|
||||
it('alternates the photo side: every second shoot has it on the right', async () => {
|
||||
await renderList();
|
||||
const reversed = screen.getAllByRole('img').map((img) =>
|
||||
// img → FramedImage wrapper → photo column
|
||||
cssRulesFor(img.parentElement!.parentElement!).some((rule) =>
|
||||
/order: 2;/.test(rule),
|
||||
),
|
||||
);
|
||||
expect(reversed).toEqual([false, true, false, true, false]);
|
||||
});
|
||||
|
||||
it('only loads the first photo straight away', async () => {
|
||||
await renderList();
|
||||
expect(
|
||||
screen
|
||||
.getAllByRole('img')
|
||||
.map((img) => img.getAttribute('loading')),
|
||||
).toEqual([null, 'lazy', 'lazy', 'lazy', 'lazy']);
|
||||
});
|
||||
|
||||
it('draws a line between the shoots, not above the first', async () => {
|
||||
await renderList();
|
||||
const borders = screen
|
||||
.getAllByRole('article')
|
||||
.map((article) =>
|
||||
cssRulesFor(article.parentElement!).some((rule) =>
|
||||
/border-top-width: 1px/.test(rule),
|
||||
),
|
||||
);
|
||||
expect(borders).toEqual([false, true, true, true, true]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import { Box } from '@chakra-ui/react';
|
||||
import PageSection from '@/components/PageSection/PageSection';
|
||||
import type { PricingPackage, ShootType } from '@/content/types';
|
||||
import ShootBlock from '../ShootBlock/ShootBlock';
|
||||
|
||||
type ShootListProps = {
|
||||
shoots: readonly ShootType[];
|
||||
packages: readonly PricingPackage[];
|
||||
portfolioLive: boolean;
|
||||
};
|
||||
|
||||
// The shoot types below the page head, photo and text alternating sides,
|
||||
// with a hairline between them (design .shoot + .shoot). The section needs
|
||||
// no name of its own: every shoot is an article named by its heading.
|
||||
export default function ShootList({
|
||||
shoots,
|
||||
packages,
|
||||
portfolioLive,
|
||||
}: ShootListProps) {
|
||||
return (
|
||||
<PageSection spacing="flushTop" data-testid="shoot-list">
|
||||
{shoots.map((shoot, index) => (
|
||||
<Box
|
||||
key={shoot.id}
|
||||
py="clamp(2.5rem, 6vw, 5rem)"
|
||||
borderTopWidth={index > 0 ? '1px' : undefined}
|
||||
borderColor="line"
|
||||
// The first block sits right below the page head
|
||||
pt={index === 0 ? 0 : undefined}
|
||||
>
|
||||
<ShootBlock
|
||||
shoot={shoot}
|
||||
packages={packages}
|
||||
reverse={index % 2 === 1}
|
||||
priority={index === 0}
|
||||
portfolioLive={portfolioLive}
|
||||
/>
|
||||
</Box>
|
||||
))}
|
||||
</PageSection>
|
||||
);
|
||||
}
|
||||
@@ -1,13 +1,13 @@
|
||||
import type { ShootType } from './types';
|
||||
|
||||
// Images, cropped to 4:5 (960×1200) from the live photos
|
||||
// Images, cropped to 4:5 (848×1060, never upscaled) from the live photos
|
||||
import newborn from '../assets/shoots/newborn.jpg';
|
||||
import zwangerschap from '../assets/shoots/zwangerschap.jpg';
|
||||
import gezin from '../assets/shoots/gezin.jpg';
|
||||
import loveshoot from '../assets/shoots/loveshoot.jpg';
|
||||
import portret from '../assets/shoots/portret.jpg';
|
||||
|
||||
const size = { width: 960, height: 1200 };
|
||||
const size = { width: 848, height: 1060 };
|
||||
|
||||
// The shoot types until the CMS API exists, in page order. Texts from the
|
||||
// live site (FR-SF-02); also used by the portfolio page for its filters.
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
import type { ShootTypesPageContent } from './types';
|
||||
|
||||
// Static content of the shoot types page until the CMS API exists; texts
|
||||
// from the design (FR-SF-01, FR-SF-03)
|
||||
const shootTypesPageContent: ShootTypesPageContent = {
|
||||
head: {
|
||||
eyebrow: 'Mogelijkheden',
|
||||
title: 'Soorten fotoshoots',
|
||||
intro: 'Hieronder vind je de verschillende soorten fotoshoots die je bij mij kunt boeken. Ik fotografeer voornamelijk in Huizen, Bussum, Hilversum en omgeving, maar ik kom ook naar andere locaties.',
|
||||
},
|
||||
closing: {
|
||||
title: 'Benieuwd naar de prijzen?',
|
||||
lead: [
|
||||
'Bekijk ',
|
||||
{ text: 'de pakketten', to: '/', hash: 'prijzen' },
|
||||
' op de homepage of stel je vraag via het contactformulier.',
|
||||
],
|
||||
// The homepage contact section until /contact exists
|
||||
booking: { label: 'Boek je shoot', to: '/', hash: 'contact' },
|
||||
},
|
||||
};
|
||||
|
||||
export default shootTypesPageContent;
|
||||
@@ -159,6 +159,17 @@ export interface AboutPageContent {
|
||||
person: { name: string; jobTitle: string; knowsAbout: string[] };
|
||||
}
|
||||
|
||||
// Content of the shoot types page (/soorten-fotoshoots); the shoots
|
||||
// themselves come from shootTypes
|
||||
export interface ShootTypesPageContent {
|
||||
head: { eyebrow: string; title: string; intro: string };
|
||||
closing: {
|
||||
title: string;
|
||||
lead: RichText;
|
||||
booking: LinkTarget & { label: string };
|
||||
};
|
||||
}
|
||||
|
||||
export interface HeroSlide {
|
||||
id: string;
|
||||
src: string;
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
import fc from 'fast-check';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import packages from '../content/packages';
|
||||
import shootTypes from '../content/shootTypes';
|
||||
import sitePages from '../sitePages';
|
||||
import { anyPackage, shootType } from '../test/arbitraries';
|
||||
import {
|
||||
isPortfolioLive,
|
||||
shootContactLink,
|
||||
shootPortfolioLink,
|
||||
} from './shootLinks';
|
||||
import { visiblePackages } from './visiblePackages';
|
||||
|
||||
const shoot = (id: string) => shootTypes.find((item) => item.id === id)!;
|
||||
|
||||
describe('shootContactLink', () => {
|
||||
it('preselects the package of a shoot that has one', () => {
|
||||
expect(shootContactLink(shoot('newborn'), packages)).toEqual({
|
||||
to: '/',
|
||||
search: { pakket: 'newborn' },
|
||||
hash: 'contact',
|
||||
});
|
||||
});
|
||||
|
||||
it('links without a package for a shoot that has none', () => {
|
||||
expect(shootContactLink(shoot('loveshoot'), packages)).toEqual({
|
||||
to: '/',
|
||||
hash: 'contact',
|
||||
});
|
||||
});
|
||||
|
||||
it('leaves out a package that is not shown', () => {
|
||||
expect(
|
||||
shootContactLink(
|
||||
shoot('gezin'),
|
||||
packages.filter((pkg) => pkg.id !== 'gezin'),
|
||||
),
|
||||
).toEqual({ to: '/', hash: 'contact' });
|
||||
});
|
||||
|
||||
it('always goes to the contact section (invariant)', () => {
|
||||
fc.assert(
|
||||
fc.property(shootType, fc.array(anyPackage), (item, list) => {
|
||||
const link = shootContactLink(item, list);
|
||||
return link.to === '/' && link.hash === 'contact';
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('only preselects a shown package, and then exactly that one (invariant)', () => {
|
||||
fc.assert(
|
||||
fc.property(shootType, fc.array(anyPackage), (item, list) => {
|
||||
const link = shootContactLink(item, list);
|
||||
const shownIds = visiblePackages(list).map((pkg) => pkg.id);
|
||||
const expected = shownIds.includes(item.packageId ?? '');
|
||||
expect(link.search !== undefined).toBe(expected);
|
||||
if (link.search !== undefined) {
|
||||
expect(link.search.pakket).toBe(item.packageId);
|
||||
expect(shownIds).toContain(link.search.pakket);
|
||||
}
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('shootPortfolioLink', () => {
|
||||
it('filters the portfolio on the shoot type (invariant)', () => {
|
||||
fc.assert(
|
||||
fc.property(shootType, (item) => {
|
||||
expect(shootPortfolioLink(item)).toEqual({
|
||||
to: '/portfolio',
|
||||
search: { shoot: item.id },
|
||||
});
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('isPortfolioLive', () => {
|
||||
it('follows whether the portfolio page is indexed', () => {
|
||||
expect(isPortfolioLive(sitePages)).toBe(
|
||||
sitePages['/portfolio'].indexed,
|
||||
);
|
||||
expect(
|
||||
isPortfolioLive({
|
||||
...sitePages,
|
||||
'/portfolio': { ...sitePages['/portfolio'], indexed: true },
|
||||
}),
|
||||
).toBe(true);
|
||||
expect(
|
||||
isPortfolioLive({
|
||||
...sitePages,
|
||||
'/portfolio': { ...sitePages['/portfolio'], indexed: false },
|
||||
}),
|
||||
).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,34 @@
|
||||
import type { PricingPackage, ShootType } from '../content/types.ts';
|
||||
import type { RoutePath } from '../navigation.ts';
|
||||
import type { PageMeta } from '../sitePages.ts';
|
||||
import { visiblePackages } from './visiblePackages.ts';
|
||||
|
||||
// Where "Stuur een berichtje" goes: the homepage contact section, with the
|
||||
// shoot's package preselected when that package is shown (BR-SF-01..03).
|
||||
// Once /contact exists, only this function changes.
|
||||
export function shootContactLink(
|
||||
shoot: ShootType,
|
||||
packages: readonly PricingPackage[],
|
||||
) {
|
||||
const shown = visiblePackages(packages).some(
|
||||
(pkg) => pkg.id === shoot.packageId,
|
||||
);
|
||||
return shown && shoot.packageId !== undefined
|
||||
? {
|
||||
to: '/' as const,
|
||||
search: { pakket: shoot.packageId },
|
||||
hash: 'contact',
|
||||
}
|
||||
: { to: '/' as const, hash: 'contact' };
|
||||
}
|
||||
|
||||
// "Bekijk meer …foto's": the portfolio filtered on this shoot type
|
||||
export function shootPortfolioLink(shoot: ShootType) {
|
||||
return { to: '/portfolio' as const, search: { shoot: shoot.id } };
|
||||
}
|
||||
|
||||
// The portfolio links only show once the portfolio page is live, so no
|
||||
// visitor lands on the placeholder (BR-SF-04)
|
||||
export function isPortfolioLive(pages: Record<RoutePath, PageMeta>): boolean {
|
||||
return pages['/portfolio'].indexed;
|
||||
}
|
||||
@@ -1,17 +1,65 @@
|
||||
import { createFileRoute } from '@tanstack/react-router';
|
||||
import CallToAction from '../components/CallToAction/CallToAction';
|
||||
import LinkButton from '../components/LinkButton';
|
||||
import PageIntro from '../components/PageIntro/PageIntro';
|
||||
import { pageHead } from '../seo';
|
||||
import RichParagraph from '../components/RichParagraph/RichParagraph';
|
||||
import ShootList from '../components/shoots/ShootList/ShootList';
|
||||
import packages from '../content/packages';
|
||||
import shootTypes from '../content/shootTypes';
|
||||
import shootTypesPageContent from '../content/shootTypesPageContent';
|
||||
import siteContent from '../content/siteContent';
|
||||
import { isPortfolioLive } from '../lib/shootLinks';
|
||||
import { jsonLdScript, pageHead, shootServices, webPage } from '../seo';
|
||||
import sitePages from '../sitePages';
|
||||
|
||||
export const Route = createFileRoute('/soorten-fotoshoots')({
|
||||
head: () => pageHead('/soorten-fotoshoots'),
|
||||
component: PhotoshootTypes,
|
||||
});
|
||||
|
||||
// Placeholder tot de echte pagina er is (noindex via sitePages)
|
||||
// The shoot types page: the page head, the shoots one by one and a closing
|
||||
// call to action, in the order of LAYOUT.md
|
||||
function PhotoshootTypes() {
|
||||
const { head, closing } = shootTypesPageContent;
|
||||
return (
|
||||
<PageIntro eyebrow="Mogelijkheden" title="Soorten fotoshoots">
|
||||
Deze pagina is nog in de maak. Kom snel terug!
|
||||
</PageIntro>
|
||||
<>
|
||||
{/* The structured data lives here, not in head(): head() is part
|
||||
of the main bundle, the component is split off, so the shoot
|
||||
texts only load with this page. Google reads JSON-LD anywhere
|
||||
in the page; jsonLdScript escapes <, > and &. */}
|
||||
<script
|
||||
type="application/ld+json"
|
||||
dangerouslySetInnerHTML={{
|
||||
__html: jsonLdScript(
|
||||
webPage('WebPage', '/soorten-fotoshoots', {
|
||||
mainEntity: shootServices(shootTypes, siteContent),
|
||||
}),
|
||||
),
|
||||
}}
|
||||
/>
|
||||
<PageIntro eyebrow={head.eyebrow} title={head.title}>
|
||||
{head.intro}
|
||||
</PageIntro>
|
||||
<ShootList
|
||||
shoots={shootTypes}
|
||||
packages={packages}
|
||||
portfolioLive={isPortfolioLive(sitePages)}
|
||||
/>
|
||||
<CallToAction
|
||||
title={closing.title}
|
||||
titleId="shoot-types-cta-title"
|
||||
lead={<RichParagraph paragraph={closing.lead} />}
|
||||
data-testid="shoot-types-cta"
|
||||
>
|
||||
<LinkButton
|
||||
variant="accent"
|
||||
to={closing.booking.to}
|
||||
hash={closing.booking.hash}
|
||||
data-testid="shoot-types-booking-link"
|
||||
>
|
||||
{closing.booking.label}
|
||||
</LinkButton>
|
||||
</CallToAction>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import fc from 'fast-check';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import aboutContent from './content/aboutContent';
|
||||
import shootTypes from './content/shootTypes';
|
||||
import siteContent from './content/siteContent';
|
||||
import { emailAddress } from './lib/emailAddress';
|
||||
import { visibleSocials } from './lib/visibleSocials';
|
||||
import type { RoutePath } from './navigation';
|
||||
import {
|
||||
aboutPage,
|
||||
absoluteUrl,
|
||||
areaServed,
|
||||
businessId,
|
||||
canonicalUrl,
|
||||
@@ -16,6 +18,7 @@ import {
|
||||
person,
|
||||
personId,
|
||||
professionalService,
|
||||
shootServices,
|
||||
siteHead,
|
||||
siteUrl,
|
||||
structuredDataScript,
|
||||
@@ -27,6 +30,7 @@ import {
|
||||
anySiteContent,
|
||||
knowsAboutEntries,
|
||||
routePath,
|
||||
uniqueShootTypes,
|
||||
} from './test/arbitraries';
|
||||
|
||||
const meta = (head: ReturnType<typeof pageHead>, key: string) =>
|
||||
@@ -444,3 +448,124 @@ describe('webPage', () => {
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('absoluteUrl', () => {
|
||||
it('makes a bundled image path absolute and keeps absolute URLs', () => {
|
||||
expect(absoluteUrl('/assets/newborn-abc.jpg')).toBe(
|
||||
`${siteUrl}/assets/newborn-abc.jpg`,
|
||||
);
|
||||
expect(absoluteUrl('assets/x.jpg')).toBe(`${siteUrl}/assets/x.jpg`);
|
||||
expect(absoluteUrl('https://cdn.example.nl/x.jpg')).toBe(
|
||||
'https://cdn.example.nl/x.jpg',
|
||||
);
|
||||
});
|
||||
|
||||
it('always gives an https URL, and applying it twice changes nothing (invariant, idempotency)', () => {
|
||||
fc.assert(
|
||||
fc.property(fc.oneof(fc.webPath(), fc.webUrl()), (src) => {
|
||||
const once = absoluteUrl(src);
|
||||
expect(once).toMatch(/^https?:\/\//);
|
||||
expect(absoluteUrl(once)).toBe(once);
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('shootServices', () => {
|
||||
const page = `${siteUrl}/soorten-fotoshoots`;
|
||||
|
||||
it('lists the five shoots as services of the business, without prices', () => {
|
||||
const list = shootServices(shootTypes, siteContent);
|
||||
expect(list.numberOfItems).toBe(5);
|
||||
const services = list.itemListElement.map((element) => element.item);
|
||||
expect(services.map((service) => service['@id'])).toEqual([
|
||||
`${page}#newborn`,
|
||||
`${page}#zwangerschap`,
|
||||
`${page}#gezin`,
|
||||
`${page}#loveshoot`,
|
||||
`${page}#portret`,
|
||||
]);
|
||||
expect(services[0]).toMatchObject({
|
||||
'@type': 'Service',
|
||||
name: 'Newbornshoot',
|
||||
serviceType: 'Newbornshoot',
|
||||
provider: { '@id': businessId },
|
||||
areaServed: [
|
||||
{ '@type': 'City', name: 'Huizen' },
|
||||
{ '@type': 'AdministrativeArea', name: 'Gooi en Vechtstreek' },
|
||||
],
|
||||
});
|
||||
// Only the first paragraph: the newborn invitation is not a description
|
||||
expect(services[0].description).toBe(shootTypes[0].paragraphs[0]);
|
||||
expect(services[0].image).toMatch(/^https:\/\/andreaslop\.nl\//);
|
||||
expect(JSON.stringify(list)).not.toMatch(/offers|price/i);
|
||||
});
|
||||
|
||||
it('fits in the page data built with webPage', () => {
|
||||
const data = webPage('WebPage', '/soorten-fotoshoots', {
|
||||
mainEntity: shootServices(shootTypes, siteContent),
|
||||
});
|
||||
expect(data['@id']).toBe(page);
|
||||
expect(data.mainEntity.itemListElement).toHaveLength(5);
|
||||
});
|
||||
|
||||
it('has one item per shoot, numbered in order (invariant)', () => {
|
||||
fc.assert(
|
||||
fc.property(uniqueShootTypes, anySiteContent, (shoots, site) => {
|
||||
const list = shootServices(shoots, site);
|
||||
expect(list.numberOfItems).toBe(shoots.length);
|
||||
expect(
|
||||
list.itemListElement.map((element) => element.position),
|
||||
).toEqual(shoots.map((_, index) => index + 1));
|
||||
expect(
|
||||
list.itemListElement.map((element) => element.item.name),
|
||||
).toEqual(shoots.map((shoot) => shoot.shootLabel));
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('gives every service its own anchor as @id (invariant)', () => {
|
||||
fc.assert(
|
||||
fc.property(uniqueShootTypes, anySiteContent, (shoots, site) => {
|
||||
const ids = shootServices(shoots, site).itemListElement.map(
|
||||
(element) => element.item['@id'],
|
||||
);
|
||||
expect(new Set(ids).size).toBe(ids.length);
|
||||
ids.forEach((id, index) =>
|
||||
expect(id).toBe(`${page}#${shoots[index].id}`),
|
||||
);
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('is always provided by the business in its service area, described by the first paragraph (invariant)', () => {
|
||||
fc.assert(
|
||||
fc.property(uniqueShootTypes, anySiteContent, (shoots, site) => {
|
||||
shootServices(shoots, site).itemListElement.forEach(
|
||||
({ item }, index) => {
|
||||
expect(item.provider).toEqual({ '@id': businessId });
|
||||
expect(item.areaServed).toEqual(
|
||||
areaServed(site.serviceArea),
|
||||
);
|
||||
expect(item.description).toBe(
|
||||
shoots[index].paragraphs[0],
|
||||
);
|
||||
},
|
||||
);
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('never contains the e-mail address or a price (invariant)', () => {
|
||||
fc.assert(
|
||||
fc.property(uniqueShootTypes, anySiteContent, (shoots, site) => {
|
||||
const address = emailAddress(site.email);
|
||||
const out = jsonLdScript(shootServices(shoots, site));
|
||||
return (
|
||||
(address === null || !out.includes(address)) &&
|
||||
!/"(offers|price)"/.test(out)
|
||||
);
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import type {
|
||||
AboutPageContent,
|
||||
ServiceArea,
|
||||
ShootType,
|
||||
SiteContent,
|
||||
} from './content/types.ts';
|
||||
import { knowsAboutList } from './lib/knowsAboutList.ts';
|
||||
@@ -166,6 +167,41 @@ export function aboutPage(
|
||||
});
|
||||
}
|
||||
|
||||
// An image URL for structured data: bundled images have a path, which
|
||||
// becomes absolute on the site; an absolute URL stays as it is (BR-SF-13)
|
||||
export function absoluteUrl(src: string): string {
|
||||
return /^https?:\/\//.test(src)
|
||||
? src
|
||||
: siteUrl + (src.startsWith('/') ? src : `/${src}`);
|
||||
}
|
||||
|
||||
// The shoot types as a list of services offered by the business, in page
|
||||
// order (BR-SF-10..15). Each service points to its own anchor on the page;
|
||||
// no prices, since the page does not show them.
|
||||
export function shootServices(shoots: readonly ShootType[], site: SiteContent) {
|
||||
const page = canonicalUrl('/soorten-fotoshoots');
|
||||
const area = areaServed(site.serviceArea);
|
||||
return {
|
||||
'@type': 'ItemList',
|
||||
numberOfItems: shoots.length,
|
||||
itemListElement: shoots.map((shoot, index) => ({
|
||||
'@type': 'ListItem',
|
||||
position: index + 1,
|
||||
item: {
|
||||
'@type': 'Service',
|
||||
'@id': `${page}#${shoot.id}`,
|
||||
url: `${page}#${shoot.id}`,
|
||||
name: shoot.shootLabel,
|
||||
serviceType: shoot.shootLabel,
|
||||
description: shoot.paragraphs[0],
|
||||
image: absoluteUrl(shoot.image.src),
|
||||
provider: { '@id': businessId },
|
||||
areaServed: area,
|
||||
},
|
||||
})),
|
||||
};
|
||||
}
|
||||
|
||||
// A head script tag with structured data, escaped by jsonLdScript (BR-SD-07)
|
||||
export function structuredDataScript(data: unknown) {
|
||||
return {
|
||||
|
||||
@@ -46,8 +46,14 @@ const sitePages: Record<RoutePath, PageMeta> = {
|
||||
'/soorten-fotoshoots': {
|
||||
title: 'Soorten fotoshoots',
|
||||
description:
|
||||
'Van loveshoot tot gezins-, zwangerschaps- en newbornshoot: ontdek welke fotoshoots Andrea Slop Fotografie aanbiedt in Huizen en omgeving.',
|
||||
indexed: false,
|
||||
'Newborn-, zwangerschaps-, gezins-, love- en portretshoots: ontdek welke fotoshoots Andrea Slop Fotografie aanbiedt in Huizen, het Gooi en omgeving.',
|
||||
indexed: true,
|
||||
ogImage: {
|
||||
path: '/og-soorten-fotoshoots.jpg',
|
||||
width: 1200,
|
||||
height: 630,
|
||||
alt: 'Een pasgeboren baby slaapt in een gestreept pakje',
|
||||
},
|
||||
},
|
||||
'/contact': {
|
||||
title: 'Contact',
|
||||
|
||||
@@ -17,10 +17,11 @@ const locs = (xml: string) => {
|
||||
const page = fc.record({ path: routePath, indexed: fc.boolean() });
|
||||
|
||||
describe('sitemapXml', () => {
|
||||
it('contains the homepage and the about page', () => {
|
||||
it('contains the indexed pages', () => {
|
||||
expect(locs(sitemapXml(pageList(sitePages), base))).toEqual([
|
||||
`${base}/`,
|
||||
`${base}/over-mij`,
|
||||
`${base}/soorten-fotoshoots`,
|
||||
]);
|
||||
});
|
||||
|
||||
|
||||