Tudor Sitaru
62eeee5f7c
Build and Push Docker Images / Build Backend (FastAPI) (push) Successful in 1m1s
Build and Push Docker Images / Build Frontend (Next.js) (push) Successful in 53s
Build and Push Docker Images / Build Pipeline (Meltano + dbt + Airflow) (push) Successful in 2m4s
Build and Push Docker Images / Trigger Portainer Update (push) Successful in 1s
Frontend - Dynamic-import Chart.js components on detail/compare views so Chart.js no longer ships in initial JS. - Drop force-dynamic on home, compare, rankings so internal data fetches reuse Next.js's per-call revalidate cache. - Switch /school/[slug] to ISR with a 7-day revalidate window (school data updates annually). - Preconnect to analytics + postcodes.io; remove redundant defer on the Umami Script tag (afterInteractive already covers it). - Bump images.minimumCacheTTL to 1 year. - Extract HowItWorks and Editorial sections as server components passed to HomeView via slot props so their JSX stays out of the client bundle. Backend - Add GZipMiddleware (min 512 bytes). - Add CacheAndETagMiddleware: per-path Cache-Control with long s-maxage + stale-while-revalidate, ETag generation, and 304 on If-None-Match. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
80 lines
2.4 KiB
TypeScript
80 lines
2.4 KiB
TypeScript
/**
|
|
* Rankings Page (SSR)
|
|
* Display top-ranked schools by various metrics
|
|
*/
|
|
|
|
import { fetchRankings, fetchFilters, fetchMetrics } from '@/lib/api';
|
|
import { RankingsView } from '@/components/RankingsView';
|
|
import type { Metadata } from 'next';
|
|
|
|
interface RankingsPageProps {
|
|
searchParams: Promise<{
|
|
metric?: string;
|
|
local_authority?: string;
|
|
year?: string;
|
|
phase?: string;
|
|
}>;
|
|
}
|
|
|
|
export const metadata: Metadata = {
|
|
title: 'School Rankings',
|
|
description: 'Top-ranked schools by SATs and GCSE performance across England',
|
|
keywords: 'school rankings, top schools, best schools, KS2 rankings, KS4 rankings, school league tables',
|
|
};
|
|
|
|
// Dynamic via searchParams; remove force-dynamic so internal data fetches
|
|
// can still use Next.js's per-call revalidate cache.
|
|
|
|
export default async function RankingsPage({ searchParams }: RankingsPageProps) {
|
|
const { metric: metricParam, local_authority, year: yearParam, phase: phaseParam } = await searchParams;
|
|
|
|
const phase = phaseParam || 'primary';
|
|
const metric = metricParam || (phase === 'secondary' ? 'attainment_8_score' : 'rwm_high_pct');
|
|
const year = yearParam ? parseInt(yearParam) : undefined;
|
|
|
|
// Fetch rankings data with error handling
|
|
try {
|
|
const [rankingsResponse, filtersResponse, metricsResponse] = await Promise.all([
|
|
fetchRankings({
|
|
metric,
|
|
local_authority,
|
|
year,
|
|
limit: 100,
|
|
phase,
|
|
}),
|
|
fetchFilters(),
|
|
fetchMetrics(),
|
|
]);
|
|
|
|
// Metrics is already an array
|
|
const metricsArray = metricsResponse?.metrics || [];
|
|
|
|
return (
|
|
<RankingsView
|
|
rankings={rankingsResponse?.rankings || []}
|
|
filters={filtersResponse || { local_authorities: [], school_types: [], years: [], phases: [], genders: [], admissions_policies: [] }}
|
|
metrics={metricsArray}
|
|
selectedMetric={metric}
|
|
selectedArea={local_authority}
|
|
selectedYear={year}
|
|
selectedPhase={phase}
|
|
/>
|
|
);
|
|
} catch (error) {
|
|
console.error('Error fetching data for rankings page:', error);
|
|
|
|
// Return error state with empty data
|
|
return (
|
|
<RankingsView
|
|
rankings={[]}
|
|
filters={{ local_authorities: [], school_types: [], years: [], phases: [], genders: [], admissions_policies: [] }}
|
|
metrics={[]}
|
|
selectedMetric={metric}
|
|
selectedArea={local_authority}
|
|
selectedYear={year}
|
|
selectedPhase={phase}
|
|
/>
|
|
);
|
|
}
|
|
}
|