Fix for 404 and e2e test

frontend/src/app/[locale]/newsletter/confirmation/page.tsx

@@ -8,19 +8,18 @@ import PageSEO from "src/components/PageSEO";
 import BetaAlert from "src/components/BetaAlert";
 import { useTranslations } from "next-intl";
 import { Metadata } from "next";
+import { getTranslations } from "next-intl/server";
 
-export function generateMetadata() {
-  // TODO: Enable once [locale] folder created, see: https://next-intl-docs.vercel.app/docs/getting-started/app-router/with-i18n-routing
-  // const t = await getTranslations({ locale: "en" });
+export async function generateMetadata() {
+  const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {
-    // title: t("Newsletter.page_title"),
-    title: "Newsletter Confirmation | Simpler.Grants.gov",
-    description:
-      "A one‑stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.",
+    title: t("Newsletter.page_title"),
+    description: t("Index.meta_description"),
   };
 
   return meta;
 }
+
 export default function NewsletterConfirmation() {
   const t = useTranslations("Newsletter_confirmation");
 

frontend/src/app/[locale]/newsletter/page.tsx

@@ -7,20 +7,18 @@ import PageSEO from "src/components/PageSEO";
 import BetaAlert from "src/components/BetaAlert";
 import NewsletterForm from "src/app/[locale]/newsletter/NewsletterForm";
 import { Metadata } from "next";
+import { getTranslations } from "next-intl/server";
 import {
   useTranslations,
   useMessages,
   NextIntlClientProvider,
 } from "next-intl";
 
-export function generateMetadata() {
-  // TODO: Enable once [locale] folder created, see: https://next-intl-docs.vercel.app/docs/getting-started/app-router/with-i18n-routing
-  // const t = await getTranslations({ locale: "en" });
+export async function generateMetadata() {
+  const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {
-    // title: t("Newsletter.page_title"),
-    title: "Newsletter | Simpler.Grants.gov",
-    description:
-      "A one‑stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.",
+    title: t("Newsletter.page_title"),
+    description: t("Index.meta_description"),
   };
 
   return meta;

frontend/src/app/[locale]/newsletter/unsubscribe/page.tsx

@@ -8,15 +8,13 @@ import PageSEO from "src/components/PageSEO";
 import BetaAlert from "src/components/BetaAlert";
 import { useTranslations } from "next-intl";
 import { Metadata } from "next";
+import { getTranslations } from "next-intl/server";
 
-export function generateMetadata() {
-  // TODO: Enable once [locale] folder created, see: https://next-intl-docs.vercel.app/docs/getting-started/app-router/with-i18n-routing
-  // const t = await getTranslations({ locale: "en" });
+export async function generateMetadata() {
+  const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {
-    // title: t("Newsletter.page_title"),
-    title: "Newsletter | Simpler.Grants.gov",
-    description:
-      "A one‑stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.",
+    title: t("Newsletter.page_title"),
+    description: t("Index.meta_description"),
   };
 
   return meta;

frontend/src/app/[locale]/page.tsx

@@ -5,19 +5,17 @@ import IndexGoalContent from "src/components/content/IndexGoalContent";
 import ProcessAndResearchContent from "src/components/content/ProcessAndResearchContent";
 import { Metadata } from "next";
 import { useTranslations } from "next-intl";
+import { getTranslations } from "next-intl/server";
 
-export function generateMetadata() {
-  // TODO: Enable once [locale] folder created, see: https://next-intl-docs.vercel.app/docs/getting-started/app-router/with-i18n-routing
-  // const t = await getTranslations({ locale: "en" });
+export async function generateMetadata() {
+  const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {
-    // title: t("Research.page_title"),
-    title: "Simpler.Grants.gov",
-    description:
-      "A one‑stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.",
+    title: t("Index.page_title"),
+    description: t("Index.meta_description"),
   };
-
   return meta;
 }
+
 export default function Home() {
   const t = useTranslations("Index");
 

frontend/src/app/[locale]/process/page.tsx

@@ -9,17 +9,14 @@ import ProcessIntro from "src/app/[locale]/process/ProcessIntro";
 import ProcessInvolved from "src/app/[locale]/process/ProcessInvolved";
 import ProcessMilestones from "src/app/[locale]/process/ProcessMilestones";
 import { useTranslations } from "next-intl";
+import { getTranslations } from "next-intl/server";
 
-export function generateMetadata() {
-  // TODO: Enable once [locale] folder created, see: https://next-intl-docs.vercel.app/docs/getting-started/app-router/with-i18n-routing
-  // const t = await getTranslations({ locale: "en" });
+export async function generateMetadata() {
+  const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {
-    // title: t("Process.page_title"),
-    title: "Process | Simpler.Grants.gov",
-    description:
-      "A one‑stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.",
+    title: t("Process.page_title"),
+    description: t("Process.meta_description"),
   };
-
   return meta;
 }
 

frontend/src/app/[locale]/research/page.tsx

@@ -10,19 +10,17 @@ import ResearchMethodology from "src/app/[locale]/research/ResearchMethodology";
 import ResearchThemes from "src/app/[locale]/research/ResearchThemes";
 import { Metadata } from "next";
 import { useTranslations } from "next-intl";
+import { getTranslations } from "next-intl/server";
 
-export function generateMetadata() {
-  // TODO: Enable once [locale] folder created, see: https://next-intl-docs.vercel.app/docs/getting-started/app-router/with-i18n-routing
-  // const t = await getTranslations({ locale: "en" });
+export async function generateMetadata() {
+  const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {
-    // title: t("Research.page_title"),
-    title: "Research | Simpler.Grants.gov",
-    description:
-      "A one‑stop shop for all federal discretionary funding to make it easy for you to discover, understand, and apply for opportunities.",
+    title: t("Research.page_title"),
+    description: t("Research.meta_description"),
   };
-
   return meta;
 }
+
 export default function Research() {
   const t = useTranslations("Research");
 

frontend/src/app/[locale]/search/page.tsx

@@ -25,10 +25,11 @@ export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {
     title: t("Search.title"),
+    description: t("Index.meta_description"),
   };
-
   return meta;
 }
+
 async function Search({ searchParams }: ServerPageProps) {
   const convertedSearchParams = convertSearchParamsToProperTypes(searchParams);
   const initialSearchResults = await searchFetcher.fetchOpportunities(

frontend/src/app/[locale]/layout.tsx → frontend/src/app/layout.tsx

@@ -1,6 +1,6 @@
 import "src/styles/styles.scss";
 import { GoogleAnalytics } from "@next/third-parties/google";
-import { PUBLIC_ENV } from "../../constants/environments";
+import { PUBLIC_ENV } from "src/constants/environments";
 
 import Layout from "src/components/Layout";
 import { unstable_setRequestLocale } from "next-intl/server";

frontend/src/app/[locale]/not-found.tsx → frontend/src/app/not-found.tsx

@@ -2,8 +2,20 @@ import BetaAlert from "src/components/BetaAlert";
 import { GridContainer } from "@trussworks/react-uswds";
 import Link from "next/link";
 import { useTranslations } from "next-intl";
+import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
+import { Metadata } from "next";
+
+export async function generateMetadata() {
+  const t = await getTranslations({ locale: "en" });
+  const meta: Metadata = {
+    title: t("ErrorPages.page_not_found.title"),
+    description: t("Index.meta_description"),
+  };
+  return meta;
+}
 
 export default function NotFound() {
+  unstable_setRequestLocale("en");
   const t = useTranslations("ErrorPages.page_not_found");
 
   return (

frontend/src/app/[locale]/template.tsx → frontend/src/app/template.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect } from "react";
 import { sendGAEvent } from "@next/third-parties/google";
-import { PUBLIC_ENV } from "../../constants/environments";
+import { PUBLIC_ENV } from "src/constants/environments";
 
 export default function Template({ children }: { children: React.ReactNode }) {
   const isProd = process.env.NODE_ENV === "production";

frontend/src/i18n/messages/en/index.ts

@@ -323,6 +323,7 @@ export const messages = {
       "The Simpler.Grants.gov newsletter is powered by the Sendy data service. Personal information is not stored within Simpler.Grants.gov. ",
   },
   ErrorPages: {
+    page_title: "Page Not Found | Simpler.Grants.gov",
     page_not_found: {
       title: "Oops! Page Not Found",
       message_content_1:

frontend/stories/pages/404.stories.tsx

@@ -1,5 +1,5 @@
 import { Meta } from "@storybook/react";
-import PageNotFound from "src/app/[locale]/not-found";
+import PageNotFound from "src/app/not-found";
 
 const meta: Meta<typeof PageNotFound> = {
   title: "Pages/404",

frontend/tests/e2e/404.spec.ts

@@ -0,0 +1,20 @@
+/* eslint-disable testing-library/prefer-screen-queries */
+import { test, expect } from "@playwright/test";
+
+test.beforeEach(async ({ page }) => {
+  await page.goto("/imnothere");
+});
+
+test.afterEach(async ({ context }) => {
+  await context.close();
+});
+
+test("has title", async ({ page }) => {
+  await expect(page).toHaveTitle("Oops! Page Not Found");
+});
+
+test("can view the home button", async ({ page }) => {
+  await expect(page.getByRole("link", { name: "Return Home" })).toHaveText(
+    "Return Home",
+  );
+});

frontend/tests/pages/404.test.tsx

@@ -1,8 +1,8 @@
-import { screen, waitFor, render } from "tests/react-utils";
-// import { render } from "@testing-library/react";
+import { screen, waitFor } from "tests/react-utils";
+import { render } from "@testing-library/react";
 
 import { axe } from "jest-axe";
-import PageNotFound from "src/app/[locale]/not-found";
+import PageNotFound from "src/app/not-found";
 
 describe("PageNotFound", () => {
   it("renders alert with grants.gov link", () => {