Skip to content
17 changes: 17 additions & 0 deletions next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,30 @@ const nextConfig: NextConfig = {
images: {
remotePatterns: storageEndpoint ? [new URL(`${storageEndpoint}/**`)] : [],
},
async redirects() {
return [
{
source: "/calendrier",
has: [{ type: "query", key: "isFrench", value: "false" }],
destination: "/calendar?",
permanent: false,
},
{
source: "/calendar",
has: [{ type: "query", key: "isFrench", value: "true" }],
destination: "/calendrier?",
permanent: false,
},
];
},
// Without a database the admin and Payload API stay hidden, as before Payload.
async rewrites() {
if (process.env.DATABASE_URL) return [];
return {
beforeFiles: [
{ source: "/admin/:path*", destination: "/nope" },
{ source: "/calendrier", destination: "/nope" },
{ source: "/calendar", destination: "/nope" },
{
source: "/api/:path((?!send-emails$).*)",
destination: "/nope",
Expand Down
130 changes: 130 additions & 0 deletions src/app/(calendar)/_page/CalendarPage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
import { headers } from "next/headers";
import { Suspense } from "react";
import {
textNames,
type CalendarLocale,
type TextName,
} from "@/lib/calendar/defaults";
import { getPublicState } from "@/lib/calendar/doors";
import { accentFontOptions } from "@/lib/calendar/fontOptions";
import {
accentFamilies,
bodyFamilies,
titleFamilies,
} from "@/lib/calendar/fonts";
import { isMember } from "@/lib/calendar/member";
import {
defaultDoorRows,
doorRowsCss,
sandColor,
themeVariables,
} from "@/lib/calendar/theme";
import { calendarMarkup, holdingMarkup } from "./markup";
import { getMessages } from "./messages";
import { openingSoundUrl } from "./openingSound";
import { calendarScript } from "./script";
import { calendarCss } from "./styles";

interface PageProps {
locale: CalendarLocale;
}

const SITE_URL =
process.env.NEXT_PUBLIC_SITE_URL || "https://clarksbowlingclub.com";

const paths = { fr: "/calendrier", en: "/calendar" } as const satisfies Record<
CalendarLocale,
string
>;

const scriptJson = (value: unknown) =>
JSON.stringify(value).replace(/</g, "\\u003c").replace(/[\u2028\u2029]/g, " ");

function pick<Value>(table: Record<string, Value>, key: string, fallback: Value) {
return Object.hasOwn(table, key) ? table[key] : fallback;
}

async function Calendar({ locale }: PageProps) {
const requestHeaders = new Headers(await headers());
const [{ settings, open }, member] = await Promise.all([
getPublicState(),
isMember(requestHeaders),
]);
const holding = !open && !member;

const texts = Object.fromEntries(
textNames.map((name) => [
name,
settings.texts[locale][name].replaceAll("{year}", String(settings.year)),
])
) as Record<TextName, string>;
const other = locale === "fr" ? "en" : "fr";
const messages = getMessages(locale, texts);

const accent = settings.fonts.accent;
const accentItalic = pick(accentFontOptions, accent, accentFontOptions.georgia).italic;
const fonts = [
`--font-title:${pick(titleFamilies, settings.fonts.title, titleFamilies.georgia)}`,
`--font-accent:${pick(accentFamilies, accent, accentFamilies.georgia)}`,
`--font-body:${pick(bodyFamilies, settings.fonts.body, bodyFamilies.system)}`,
].join(";");
const css = calendarCss({
vars: `${themeVariables(settings.colors)};${fonts}`,
background: settings.backgroundUrl
? `url("${encodeURI(settings.backgroundUrl)}") center/cover fixed no-repeat,`
: "",
doorRows: doorRowsCss(settings.doorColors ?? defaultDoorRows(settings.colors)),
accentStyle: accentItalic ? "italic" : "normal",
});

const script = [
`const M=${scriptJson(messages)},LANG=${scriptJson(locale)},YEAR=${settings.year};`,
"const fill=(text,values)=>text.replace(/\\{(\\w+)\\}/g,(_,key)=>values[key]);",
calendarScript.replace("__OPENING_SOUND__", () => scriptJson(openingSoundUrl)),
].join("\n");

const title = `${messages.title} ${messages.accentLine}`;

return (
<>
<title>{title}</title>
{holding ? null : (
<>
<link rel="canonical" href={`${SITE_URL}${paths[locale]}`} />
<link rel="alternate" hrefLang="fr" href={`${SITE_URL}${paths.fr}`} />
<link rel="alternate" hrefLang="en" href={`${SITE_URL}${paths.en}`} />
</>
)}
<meta name="description" content={messages.intro} />
<meta name="theme-color" content={sandColor(settings.colors)} />
<meta property="og:title" content={title} />
<meta property="og:description" content={messages.intro} />
{settings.shareUrl ? (
<>
<meta property="og:image" content={settings.shareUrl} />
<meta name="twitter:card" content="summary_large_image" />
</>
) : null}
{holding ? <meta name="robots" content="noindex" /> : null}
<style dangerouslySetInnerHTML={{ __html: css }} />
<div
id="calendar-root"
data-preview={String(member)}
data-start-preview={String(member && !open)}
suppressHydrationWarning
dangerouslySetInnerHTML={{
__html: holding ? holdingMarkup(messages, paths[other]) : calendarMarkup(messages, paths[other]),
}}
/>
{holding ? null : <script dangerouslySetInnerHTML={{ __html: script }} />}
</>
);
}

export function CalendarPage(props: PageProps) {
return (
<Suspense fallback={null}>
<Calendar {...props} />
</Suspense>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,30 @@ const escapeHtml = (value: string) =>
.replace(/>/g, "&gt;")
.replace(/"/g, "&quot;");

const masthead = (m: Messages) => `
const languageLink = (m: Messages, href: string) =>
`<a class="language" href="${href}" hreflang="${m.switchLang}" lang="${m.switchLang}" aria-label="${escapeHtml(m.switchLabel)}">${m.switchLang.toUpperCase()}</a>`;

const masthead = (m: Messages, switchHref: string) => `
<header class="masthead">
<span class="brand">Clark’s Bowling Club</span>
${languageLink(m, switchHref)}
<button type="button" id="sound" class="sound" aria-pressed="true">${escapeHtml(m.soundOn)}</button>
</header>`;

const heading = (m: Messages) => `
<h1 id="title">${escapeHtml(m.title)} <em>${escapeHtml(m.accentLine)}</em></h1>`;

export const holdingMarkup = (m: Messages) => `
export const holdingMarkup = (m: Messages, switchHref: string) => `
<main>
<header class="masthead"><span class="brand">Clark’s Bowling Club</span></header>
<header class="masthead"><span class="brand">Clark’s Bowling Club</span>${languageLink(m, switchHref)}</header>
<section class="hero" aria-labelledby="title">${heading(m)}
<p class="intro">${escapeHtml(m.holding)}</p>
</section>
<footer>${escapeHtml(m.footer)}</footer>
</main>`;

export const calendarMarkup = (m: Messages) => `
<main>${masthead(m)}
export const calendarMarkup = (m: Messages, switchHref: string) => `
<main>${masthead(m, switchHref)}
<section class="hero" aria-labelledby="title">
<p class="label">${escapeHtml(m.dateRange)}</p>${heading(m)}
<p class="intro">${escapeHtml(m.intro)}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import type { CalendarLocale, TextName } from "@/lib/calendar/defaults";
/** Page text that is not editable in the admin. {braces} are filled in by the page script. */
const fixed = {
fr: {
switchLabel: "English",
switchLang: "en",
portraitDay: "{day} décembre · Calendrier de Clark’s",
portraitClose: "Quitter le mode portrait",
portraitPlay: "Écouter le morceau",
Expand Down Expand Up @@ -39,6 +41,8 @@ const fixed = {
noscript: "Activez JavaScript pour ouvrir les cases et écouter les morceaux.",
},
en: {
switchLabel: "Français",
switchLang: "fr",
portraitDay: "December {day} · Clark’s Advent calendar",
portraitClose: "Leave portrait mode",
portraitPlay: "Play the track",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
export const calendarScript = String.raw`
const days=24, cookieName='clarks_advent_'+YEAR;
const cookie=document.cookie.split(';').map(part=>part.trim()).find(part=>part.startsWith(cookieName+'='));
let opened=Number(cookie?.split('=')[1])||0, soundOn=true;
let opened=document.cookie.split(';').map(part=>part.trim()).filter(part=>part.startsWith(cookieName+'=')).reduce((all,part)=>all|(Number(part.split('=')[1])||0),0), soundOn=true;
let preview=false,previewOpened=0,loadRevision=0;
const cards=[];
const sound=document.getElementById('sound');
Expand Down Expand Up @@ -109,7 +108,8 @@ function remember(day){
return;
}
opened|=1<<(day-1);
document.cookie=cookieName+'='+opened+'; Max-Age=34560000; Path=/calendrier; SameSite=Lax'+(location.protocol==='https:'?'; Secure':'');
document.cookie=cookieName+'='+opened+'; Max-Age=34560000; Path=/; SameSite=Lax'+(location.protocol==='https:'?'; Secure':'');
document.cookie=cookieName+'=; Max-Age=0; Path=/calendrier';
}
const portraitHoldMs=2000;
const clampProgress=value=>Math.max(0,Math.min(1,value));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ main{width:min(1120px,100% - 40px);margin:auto;padding:42px 0 48px}
.brand,.label,.month{letter-spacing:.16em;text-transform:uppercase;font-size:.69rem;font-weight:700}
.brand{color:var(--ink);font-size:.78rem;letter-spacing:.14em}
button{font:inherit;color:inherit;cursor:pointer}
.language{margin-left:auto;font-size:.78rem;color:var(--ink)}
.sound{border:1px solid var(--ink);border-radius:30px;background:var(--paper);padding:7px 14px;font-size:.78rem}
.preview-tools{display:flex;gap:8px;align-items:center;flex-wrap:wrap;margin:0 0 14px}
.preview-tools[hidden]{display:none}
Expand Down
9 changes: 9 additions & 0 deletions src/app/(calendar)/calendar/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export default function CalendarLayout({
children,
}: Readonly<{ children: React.ReactNode }>) {
return (
<html lang="en" suppressHydrationWarning>
<body>{children}</body>
</html>
);
}
5 changes: 5 additions & 0 deletions src/app/(calendar)/calendar/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { CalendarPage } from "../_page/CalendarPage";

export default function EnglishCalendarPage() {
return <CalendarPage locale="en" />;
}
File renamed without changes.
126 changes: 3 additions & 123 deletions src/app/(calendar)/calendrier/page.tsx
Original file line number Diff line number Diff line change
@@ -1,125 +1,5 @@
import { headers } from "next/headers";
import { Suspense } from "react";
import {
textNames,
type CalendarLocale,
type TextName,
} from "@/lib/calendar/defaults";
import { getPublicState } from "@/lib/calendar/doors";
import { accentFontOptions } from "@/lib/calendar/fontOptions";
import {
accentFamilies,
bodyFamilies,
titleFamilies,
} from "@/lib/calendar/fonts";
import { isMember } from "@/lib/calendar/member";
import {
defaultDoorRows,
doorRowsCss,
sandColor,
themeVariables,
} from "@/lib/calendar/theme";
import { calendarMarkup, holdingMarkup } from "./_page/markup";
import { getMessages } from "./_page/messages";
import { openingSoundUrl } from "./_page/openingSound";
import { calendarScript } from "./_page/script";
import { calendarCss } from "./_page/styles";
import { CalendarPage } from "../_page/CalendarPage";

interface PageProps {
searchParams: Promise<{ isFrench?: string }>;
}

/** The site's own rule: `?isFrench=` wins, otherwise the browser's language. */
function pickLocale(isFrench: string | undefined, acceptLanguage: string | null): CalendarLocale {
if (isFrench === "true" || isFrench === "false") {
return isFrench === "true" ? "fr" : "en";
}
return acceptLanguage?.trim().toLowerCase().startsWith("fr") ? "fr" : "en";
}

const scriptJson = (value: unknown) =>
JSON.stringify(value).replace(/</g, "\\u003c").replace(/[\u2028\u2029]/g, " ");

function pick<Value>(table: Record<string, Value>, key: string, fallback: Value) {
return Object.hasOwn(table, key) ? table[key] : fallback;
}

async function Calendar({ searchParams }: PageProps) {
const requestHeaders = new Headers(await headers());
const { isFrench } = await searchParams;
const locale = pickLocale(isFrench, requestHeaders.get("accept-language"));
const [{ settings, open }, member] = await Promise.all([
getPublicState(),
isMember(requestHeaders),
]);
const holding = !open && !member;

const texts = Object.fromEntries(
textNames.map((name) => [
name,
settings.texts[locale][name].replaceAll("{year}", String(settings.year)),
])
) as Record<TextName, string>;
const messages = getMessages(locale, texts);

const accent = settings.fonts.accent;
const accentItalic = pick(accentFontOptions, accent, accentFontOptions.georgia).italic;
const fonts = [
`--font-title:${pick(titleFamilies, settings.fonts.title, titleFamilies.georgia)}`,
`--font-accent:${pick(accentFamilies, accent, accentFamilies.georgia)}`,
`--font-body:${pick(bodyFamilies, settings.fonts.body, bodyFamilies.system)}`,
].join(";");
const css = calendarCss({
vars: `${themeVariables(settings.colors)};${fonts}`,
background: settings.backgroundUrl
? `url("${encodeURI(settings.backgroundUrl)}") center/cover fixed no-repeat,`
: "",
doorRows: doorRowsCss(settings.doorColors ?? defaultDoorRows(settings.colors)),
accentStyle: accentItalic ? "italic" : "normal",
});

const script = [
`const M=${scriptJson(messages)},LANG=${scriptJson(locale)},YEAR=${settings.year};`,
"document.documentElement.lang=LANG;",
"const fill=(text,values)=>text.replace(/\\{(\\w+)\\}/g,(_,key)=>values[key]);",
calendarScript.replace("__OPENING_SOUND__", () => scriptJson(openingSoundUrl)),
].join("\n");

const title = `${messages.title} ${messages.accentLine}`;

return (
<>
<title>{title}</title>
<meta name="description" content={messages.intro} />
<meta name="theme-color" content={sandColor(settings.colors)} />
<meta property="og:title" content={title} />
<meta property="og:description" content={messages.intro} />
{settings.shareUrl ? (
<>
<meta property="og:image" content={settings.shareUrl} />
<meta name="twitter:card" content="summary_large_image" />
</>
) : null}
{holding ? <meta name="robots" content="noindex" /> : null}
<style dangerouslySetInnerHTML={{ __html: css }} />
<div
id="calendar-root"
data-preview={String(member)}
data-start-preview={String(member && !open)}
suppressHydrationWarning
dangerouslySetInnerHTML={{
__html: holding ? holdingMarkup(messages) : calendarMarkup(messages),
}}
/>
{holding ? null : <script dangerouslySetInnerHTML={{ __html: script }} />}
</>
);
}

export default function CalendarPage(props: PageProps) {
return (
<Suspense fallback={null}>
<Calendar {...props} />
</Suspense>
);
export default function FrenchCalendarPage() {
return <CalendarPage locale="fr" />;
}
2 changes: 1 addition & 1 deletion src/app/(frontend)/_components/CalendarButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function CalendarButton() {

return (
<Link
href={`/calendrier?isFrench=${isFrench}`}
href={isFrench ? "/calendrier" : "/calendar"}
className="absolute bottom-32 left-1/2 z-20 -translate-x-1/2 rounded-full bg-clarks-orange px-6 py-3 text-center font-bold text-black whitespace-nowrap hover:bg-white focus:outline-hidden focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-offset-2 focus-visible:ring-offset-black"
>
{isFrench ? "Le calendrier de l’Avent" : "The advent calendar"}
Expand Down
Loading
Loading