fix(website): address review comments on the docs rework

- expire analytics cookies on every parent domain, including AdSense ones
- pass the request timeout to the direct GitHub fetch calls
- reset the PR reaction state when the router reuses the diff component
- tell challenge authors to copy, not move, the generated Markdown

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: tomalaforge

website/src/app/consent.ts

@@ -122,15 +122,24 @@ export class Consent {
   }
 
   private clearAnalyticsCookies(): void {
-    const domain = location.hostname;
+    const labels = location.hostname.split('.');
+    // "www.example.com" -> ["www.example.com", "example.com"]: the tag writes on
+    // the registrable domain, which is not always the exact host.
+    const domains = labels
+      .map((_, index) => labels.slice(index).join('.'))
+      .filter((domain) => domain.includes('.'));
+    // Analytics (_ga, _gid) plus the AdSense cookies a previous "accept" allowed.
+    const scopes = [
+      '',
+      ...domains.flatMap((domain) => [`; domain=${domain}`, `; domain=.${domain}`]),
+    ];
+
     for (const cookie of this.document.cookie.split(';')) {
       const name = cookie.split('=')[0].trim();
-      if (!name.startsWith('_ga') && !name.startsWith('_gid')) {
+      if (!/^(_ga|_gid|_gac|_gcl|__gads)/.test(name)) {
         continue;
       }
-      // The tag may have written the cookie on either the exact host or the
-      // registrable domain, so expire both.
-      for (const scope of ['', `; domain=${domain}`, `; domain=.${domain}`]) {
+      for (const scope of scopes) {
         this.document.cookie = `${name}=; Path=/; Max-Age=0${scope}`;
       }
     }

website/src/app/pages/solutions/solution-diff.ts

@@ -5,6 +5,7 @@ import {
   effect,
   inject,
   input,
+  linkedSignal,
   signal,
   untracked,
 } from '@angular/core';
@@ -36,12 +37,20 @@ export class SolutionDiff {
   protected readonly theme = inject(Theme);
   protected readonly isDark = computed(() => this.theme.current() === 'dark');
 
-  protected readonly reaction = signal<'idle' | 'saving' | 'done' | 'error'>('idle');
-
   /** Provided by the route resolver / router input binding. */
   readonly doc = input.required<Doc>();
   readonly pr = input.required<string>();
 
+  /**
+   * The component is reused when only `:pr` changes, so the reaction state is
+   * derived from `pr()` — it falls back to 'idle' for every new PR instead of
+   * keeping the previous one's 'done' (which would leave the button disabled).
+   */
+  protected readonly reaction = linkedSignal<string, 'idle' | 'saving' | 'done' | 'error'>({
+    source: this.pr,
+    computation: () => 'idle',
+  });
+
   /** 'split' on desktop, toggleable; unified is friendlier on mobile. */
   protected readonly mode = signal<'split' | 'unified'>(
     this.isBrowser && window.matchMedia('(max-width: 639px)').matches ? 'unified' : 'split',
@@ -125,10 +134,18 @@ export class SolutionDiff {
       location.href = this.auth.signInUrl();
       return;
     }
+    const pr = this.pr();
     this.reaction.set('saving');
-    this.http.post(`/api/pulls/${this.pr()}/react`, {}).subscribe({
-      next: () => this.reaction.set('done'),
-      error: () => this.reaction.set('error'),
+    this.http.post(`/api/pulls/${pr}/react`, {}).subscribe({
+      // A response that lands after navigating to another PR must not touch its state.
+      next: () => this.settle(pr, 'done'),
+      error: () => this.settle(pr, 'error'),
     });
   }
+
+  private settle(pr: string, state: 'done' | 'error'): void {
+    if (this.pr() === pr) {
+      this.reaction.set(state);
+    }
+  }
 }

website/src/content/guides/create-challenge.md

@@ -52,10 +52,11 @@ Alternatively, you may utilize your IDE's [Nx Console extension](https://nx.dev/
 - A Markdown file with minimal setup will be created inside `docs/src/content/docs/challenges/${category}`.
 
 :::caution
-The generator still writes to the legacy `docs/` folder. This website reads its challenges from
-`website/src/content/challenges/${category}/`, so move (or copy) the generated Markdown file there —
-otherwise `website/tools/generate-content.mjs` will not pick it up and your challenge will not appear
-on the site. The author file follows the same rule: `website/src/content/authors/${author}.json`.
+The generator still writes to the legacy `docs/` folder, which is still built today — so **copy**,
+don't move, the generated Markdown file to `website/src/content/challenges/${category}/` and keep
+both copies in sync until the legacy site is retired. Without that copy,
+`website/tools/generate-content.mjs` will not pick it up and your challenge will not appear on this
+site. The author file follows the same rule: `website/src/content/authors/${author}.json`.
 :::
 
 ## Challenge Creation

website/src/server/github-api.ts

@@ -225,13 +225,20 @@ githubApi.get('/me', async (req, res) => {
     res.status(401).json({ error: 'not signed in' });
     return;
   }
-  const response = await fetch('https://api.github.com/user', {
-    headers: {
-      Accept: 'application/vnd.github+json',
-      Authorization: `Bearer ${token}`,
-      'User-Agent': 'angular-challenges-website',
-    },
-  });
+  let response: Response;
+  try {
+    response = await fetch(`${GITHUB_API}/user`, {
+      headers: {
+        Accept: 'application/vnd.github+json',
+        Authorization: `Bearer ${token}`,
+        'User-Agent': 'angular-challenges-website',
+      },
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+    });
+  } catch {
+    res.status(503).json({ error: 'github request failed' });
+    return;
+  }
   if (!response.ok) {
     res.status(401).json({ error: 'invalid token' });
     return;
@@ -253,16 +260,23 @@ githubApi.post('/pulls/:number/react', async (req, res) => {
     res.status(400).json({ error: 'invalid PR number' });
     return;
   }
-  const response = await fetch(`https://api.github.com/repos/${REPO}/issues/${number}/reactions`, {
-    method: 'POST',
-    headers: {
-      Accept: 'application/vnd.github+json',
-      Authorization: `Bearer ${token}`,
-      'User-Agent': 'angular-challenges-website',
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({ content: '+1' }),
-  });
+  let response: Response;
+  try {
+    response = await fetch(`${GITHUB_API}/repos/${REPO}/issues/${number}/reactions`, {
+      method: 'POST',
+      headers: {
+        Accept: 'application/vnd.github+json',
+        Authorization: `Bearer ${token}`,
+        'User-Agent': 'angular-challenges-website',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ content: '+1' }),
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+    });
+  } catch {
+    res.status(503).json({ error: 'github request failed' });
+    return;
+  }
   if (!response.ok) {
     res.status(response.status).json({ error: 'reaction failed' });
     return;
@@ -408,6 +422,7 @@ githubApi.get('/sponsors', async (_req, res) => {
         'User-Agent': 'angular-challenges-website',
       },
       body: JSON.stringify({ query }),
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
     });
     const data = (await response.json()) as any;
     if (data?.errors) {