Tudor
39e5c11274
PR Checks / Frontend Typecheck + Tests (pull_request) Successful in 1m2s
PR Checks / Backend Smoke (pull_request) Successful in 6s
PR Checks / Build Backend (no push) (pull_request) Successful in 10s
PR Checks / Build Frontend (no push) (pull_request) Successful in 43s
PR Checks / Build Pipeline (no push) (pull_request) Successful in 10s
PR Checks / AI Code Review (Claude) (pull_request) Successful in 3m19s
Three review findings. --status-below-bg carried the raw --coral tuple (249,115,96) instead of the hue it belongs to (#A9481F → 169,72,31), so "below average" chips rendered a coral-pink wash behind terracotta text — the one solid/tint pair in the file whose hues disagreed. Alpha drops 0.15 → 0.12 to match --status-above-bg, so the two chips read as equal weight; left at 0.15 the darker terracotta tint takes the label to 4.45:1 on Warm White, under the 4.5 floor. At 0.12 it is 4.86:1 on cards and 4.67:1 on Warm White. Auditing the whole file for the same class of error turned up one more: --action-bg was also a --coral tint while --action is the darkened #BE3C27. It is unused today and the dark-theme value was already correct, but it is aligned so a future coral ghost button gets a matching label and ground. The five phase pairs also "mismatch" by the same test and are deliberately left alone: those pair a pastel ground (sage, sky, mustard, lavender) with a deeper text hue, which is exactly what the guideline's Chips/Tags show. The lowercase wordmark had only reached the visual chrome. Every user-visible occurrence now matches: page title and template, appleWebApp title, authors, OpenGraph and Twitter titles and siteName, the school page's siteName, the PWA manifest name and short_name, the footer copyright line, the nav's aria-label, the Web Share API strings, and the editorial paragraph. Comments in lib/*.ts and AdmissionsView still say "SchoolCompare"; they describe the codebase rather than the mark, so they are left to keep this diff to the reported problem. The comment explaining why the font classes belong on <html> still described --font-schibsted, which no longer exists. It now names --font-manrope and --font-inter, and records that the e2e typeface assertion is the only guard — this failure mode throws nothing and fails no unit test. Verified: tsc clean, 159/159 tests, build green, and the rendered title is now "School Admissions Guide | schoolcompare". Status and phase labels re-checked on their own composited tints over both light grounds — all clear AA.
126 lines
5.0 KiB
TypeScript
126 lines
5.0 KiB
TypeScript
import type { Metadata, Viewport } from 'next';
|
|
import { Manrope, Inter } from 'next/font/google';
|
|
import Script from 'next/script';
|
|
import { Navigation } from '@/components/Navigation';
|
|
import { Footer } from '@/components/Footer';
|
|
import { ComparisonToast } from '@/components/ComparisonToast';
|
|
import { ComparisonProvider } from '@/context/ComparisonProvider';
|
|
import './globals.css';
|
|
|
|
// Manrope carries headings and key messaging — the guideline's "friendly,
|
|
// modern personality". It never sets body copy or a control.
|
|
const manrope = Manrope({
|
|
subsets: ['latin'],
|
|
weight: ['500', '600', '700'],
|
|
variable: '--font-manrope',
|
|
display: 'swap',
|
|
});
|
|
|
|
// Inter carries body copy, every control and every figure — chosen in the
|
|
// guideline for clarity and legibility. Its tabular numerals hold a column
|
|
// properly, which matters on a page that is mostly percentages.
|
|
const inter = Inter({
|
|
subsets: ['latin'],
|
|
weight: ['400', '500', '600', '700'],
|
|
variable: '--font-inter',
|
|
display: 'swap',
|
|
});
|
|
|
|
export const viewport: Viewport = {
|
|
width: 'device-width',
|
|
initialScale: 1,
|
|
// viewport-fit=cover lets us paint behind the notch / Dynamic Island so
|
|
// env(safe-area-inset-*) values resolve to real numbers on iPhone.
|
|
viewportFit: 'cover',
|
|
// These must match --bg-primary in globals.css for each theme, or the
|
|
// browser chrome and the page disagree at the top edge of the screen.
|
|
themeColor: [
|
|
{ media: '(prefers-color-scheme: light)', color: '#FAFAF8' },
|
|
{ media: '(prefers-color-scheme: dark)', color: '#111A20' },
|
|
],
|
|
};
|
|
|
|
export const metadata: Metadata = {
|
|
appleWebApp: {
|
|
capable: true,
|
|
title: 'schoolcompare',
|
|
statusBarStyle: 'default',
|
|
},
|
|
title: {
|
|
default: 'schoolcompare | Compare School Performance',
|
|
template: '%s | schoolcompare',
|
|
},
|
|
description: 'Compare primary and secondary school SATs and GCSE performance across England',
|
|
keywords: 'school comparison, KS2 results, KS4 results, primary school, secondary school, England schools, SATs results, GCSE results',
|
|
authors: [{ name: 'schoolcompare' }],
|
|
manifest: '/manifest.json',
|
|
// No `icons` key on purpose: setting it here would override the file
|
|
// conventions. app/icon.svg and app/apple-icon.tsx are the source, and
|
|
// app/opengraph-image.tsx supplies og:image and twitter:image.
|
|
metadataBase: new URL('https://schoolcompare.co.uk'),
|
|
openGraph: {
|
|
type: 'website',
|
|
title: 'schoolcompare | Compare School Performance',
|
|
description: 'Compare primary and secondary school SATs and GCSE performance across England',
|
|
url: 'https://schoolcompare.co.uk',
|
|
siteName: 'schoolcompare',
|
|
},
|
|
twitter: {
|
|
// summary_large_image now that there is an image worth showing.
|
|
card: 'summary_large_image',
|
|
title: 'schoolcompare | Compare School Performance',
|
|
description: 'Compare primary and secondary school SATs and GCSE performance across England',
|
|
},
|
|
};
|
|
|
|
export default function RootLayout({
|
|
children,
|
|
}: Readonly<{
|
|
children: React.ReactNode;
|
|
}>) {
|
|
return (
|
|
// The font variable classes must sit on <html>, not <body>. globals.css
|
|
// declares --font-display on :root as var(--font-manrope) and --font-ui as
|
|
// var(--font-inter), and a custom property's var() references resolve on
|
|
// the element that declares it. With the classes on <body>, those two are
|
|
// undefined at :root, so --font-display computes to the guaranteed-invalid
|
|
// value and every font-family referencing it silently falls back — which
|
|
// once shipped the whole site in Times. Nothing throws and no unit test
|
|
// fails, so the e2e typeface assertion is the only guard.
|
|
<html lang="en" className={`${manrope.variable} ${inter.variable}`}>
|
|
<head>
|
|
<link rel="preconnect" href="https://analytics.schoolcompare.co.uk" />
|
|
<link rel="preconnect" href="https://api.postcodes.io" />
|
|
{/* data-domains: the tracker only fires on the production hostnames,
|
|
so staging (same image, different host) never pollutes Umami */}
|
|
<Script
|
|
src="https://analytics.schoolcompare.co.uk/script.js"
|
|
data-website-id="d7fb0c95-bb6c-4336-8209-bd10077e50dd"
|
|
data-domains="schoolcompare.co.uk,www.schoolcompare.co.uk"
|
|
data-performance="true"
|
|
strategy="afterInteractive"
|
|
/>
|
|
{/* Heatmap / session recorder — same data-domains guard so staging
|
|
(same image, different host) never feeds the heatmap. */}
|
|
<Script
|
|
src="https://analytics.schoolcompare.co.uk/recorder.js"
|
|
data-website-id="d7fb0c95-bb6c-4336-8209-bd10077e50dd"
|
|
data-domains="schoolcompare.co.uk,www.schoolcompare.co.uk"
|
|
strategy="afterInteractive"
|
|
/>
|
|
</head>
|
|
<body>
|
|
<ComparisonProvider>
|
|
<a href="#main-content" className="skip-link">Skip to main content</a>
|
|
<Navigation />
|
|
<main id="main-content" className="main">
|
|
{children}
|
|
</main>
|
|
<ComparisonToast />
|
|
<Footer />
|
|
</ComparisonProvider>
|
|
</body>
|
|
</html>
|
|
);
|
|
}
|