diff --git a/frontend/src/app/[locale]/subscribe/confirmation/page.tsx b/frontend/src/app/[locale]/subscribe/confirmation/page.tsx
index 1b6c7b779..f6f9f65c6 100644
--- a/frontend/src/app/[locale]/subscribe/confirmation/page.tsx
+++ b/frontend/src/app/[locale]/subscribe/confirmation/page.tsx
@@ -5,14 +5,14 @@ import { LocalizedPageProps } from "src/types/intl";
import { useTranslations } from "next-intl";
import { getTranslations, setRequestLocale } from "next-intl/server";
import Link from "next/link";
+import { use } from "react";
import { Grid, GridContainer } from "@trussworks/react-uswds";
import BetaAlert from "src/components/BetaAlert";
import Breadcrumbs from "src/components/Breadcrumbs";
-export async function generateMetadata({
- params: { locale },
-}: LocalizedPageProps) {
+export async function generateMetadata({ params }: LocalizedPageProps) {
+ const { locale } = await params;
const t = await getTranslations({ locale });
const meta: Metadata = {
title: t("Subscribe.page_title"),
@@ -23,8 +23,9 @@ export async function generateMetadata({
}
export default function SubscriptionConfirmation({
- params: { locale },
+ params,
}: LocalizedPageProps) {
+ const { locale } = use(params);
setRequestLocale(locale);
const t = useTranslations("Subscription_confirmation");
diff --git a/frontend/src/app/[locale]/subscribe/page.tsx b/frontend/src/app/[locale]/subscribe/page.tsx
index a9d9d65f5..94446c96e 100644
--- a/frontend/src/app/[locale]/subscribe/page.tsx
+++ b/frontend/src/app/[locale]/subscribe/page.tsx
@@ -4,15 +4,15 @@ import { LocalizedPageProps } from "src/types/intl";
import { useTranslations } from "next-intl";
import { getTranslations, setRequestLocale } from "next-intl/server";
+import { use } from "react";
import { Grid, GridContainer } from "@trussworks/react-uswds";
import BetaAlert from "src/components/BetaAlert";
import Breadcrumbs from "src/components/Breadcrumbs";
import SubscriptionForm from "src/components/subscribe/SubscriptionForm";
-export async function generateMetadata({
- params: { locale },
-}: LocalizedPageProps) {
+export async function generateMetadata({ params }: LocalizedPageProps) {
+ const { locale } = await params;
const t = await getTranslations({ locale });
const meta: Metadata = {
title: t("Subscribe.page_title"),
@@ -22,7 +22,8 @@ export async function generateMetadata({
return meta;
}
-export default function Subscribe({ params: { locale } }: LocalizedPageProps) {
+export default function Subscribe({ params }: LocalizedPageProps) {
+ const { locale } = use(params);
setRequestLocale(locale);
const t = useTranslations("Subscribe");
diff --git a/frontend/src/app/[locale]/subscribe/unsubscribe/page.tsx b/frontend/src/app/[locale]/subscribe/unsubscribe/page.tsx
index 3fd60301e..8e5e39fff 100644
--- a/frontend/src/app/[locale]/subscribe/unsubscribe/page.tsx
+++ b/frontend/src/app/[locale]/subscribe/unsubscribe/page.tsx
@@ -5,14 +5,14 @@ import { LocalizedPageProps } from "src/types/intl";
import { useTranslations } from "next-intl";
import { getTranslations, setRequestLocale } from "next-intl/server";
import Link from "next/link";
+import { use } from "react";
import { Grid, GridContainer } from "@trussworks/react-uswds";
import BetaAlert from "src/components/BetaAlert";
import Breadcrumbs from "src/components/Breadcrumbs";
-export async function generateMetadata({
- params: { locale },
-}: LocalizedPageProps) {
+export async function generateMetadata({ params }: LocalizedPageProps) {
+ const { locale } = await params;
const t = await getTranslations({ locale });
const meta: Metadata = {
title: t("Subscribe.page_title"),
@@ -22,9 +22,8 @@ export async function generateMetadata({
return meta;
}
-export default function Unsubscribe({
- params: { locale },
-}: LocalizedPageProps) {
+export default function Unsubscribe({ params }: LocalizedPageProps) {
+ const { locale } = use(params);
setRequestLocale(locale);
const t = useTranslations("Unsubscription_confirmation");
diff --git a/frontend/src/app/[locale]/user/page.tsx b/frontend/src/app/[locale]/user/page.tsx
index 31064ef63..7dbf34a30 100644
--- a/frontend/src/app/[locale]/user/page.tsx
+++ b/frontend/src/app/[locale]/user/page.tsx
@@ -6,9 +6,8 @@ import { GridContainer } from "@trussworks/react-uswds";
import { LogoutButton } from "./LogoutButton";
-export async function generateMetadata({
- params: { locale },
-}: LocalizedPageProps) {
+export async function generateMetadata({ params }: LocalizedPageProps) {
+ const { locale } = await params;
const t = await getTranslations({ locale });
const meta: Metadata = {
title: t("User.pageTitle"),
@@ -25,11 +24,12 @@ export async function generateMetadata({
// response in the client.
export default async function UserDisplay({
searchParams,
- params: { locale },
-}: LocalizedPageProps & { searchParams: { message?: string } }) {
- const { message } = searchParams;
-
+ params,
+}: LocalizedPageProps & { searchParams: Promise<{ message?: string }> }) {
+ const { message } = await searchParams;
+ const { locale } = await params;
const t = await getTranslations({ locale, namespace: "User" });
+
return (
{t("heading")}
diff --git a/frontend/src/app/api/auth/logout/route.ts b/frontend/src/app/api/auth/logout/route.ts
index ec6247aa3..cad8fa65e 100644
--- a/frontend/src/app/api/auth/logout/route.ts
+++ b/frontend/src/app/api/auth/logout/route.ts
@@ -14,7 +14,7 @@ export async function POST() {
throw new Error("No logout response from API");
}
// delete session from current cookies
- deleteSession();
+ await deleteSession();
return Response.json({ message: "logout success" });
} catch (e) {
const error = e as Error;
diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
index e96f14053..92426718c 100644
--- a/frontend/src/components/Header.tsx
+++ b/frontend/src/components/Header.tsx
@@ -1,10 +1,11 @@
"use client";
import clsx from "clsx";
+import GrantsLogo from "public/img/grants-logo.png";
import { useFeatureFlags } from "src/hooks/useFeatureFlags";
-import { assetPath } from "src/utils/assetPath";
import { useTranslations } from "next-intl";
+import Image from "next/image";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useCallback, useEffect, useMemo, useState } from "react";
@@ -29,8 +30,6 @@ type Props = {
const homeRegexp = /^\/(?:e[ns])?$/;
-const logoPath = "./img/grants-logo.svg";
-
const NavLinks = ({
mobileExpanded,
onToggleMobileNav,
@@ -173,13 +172,12 @@ const Header = ({ locale }: Props) => {
<div className="display-flex flex-align-center">
<Link href="/" className="display-block">
- {logoPath && (
- <img
- src={assetPath(logoPath)}
- alt={t("title")}
- className="display-block height-4 desktop:height-auto"
- />
- )}
+ <Image
+ alt={t("title")}
+ src={GrantsLogo}
+ className="display-block height-4 desktop:height-auto"
+ priority={false}
+ />
</Link>
</div>
diff --git a/frontend/src/components/Loading.tsx b/frontend/src/components/Loading.tsx
index 8e7da1e5a..113532d33 100644
--- a/frontend/src/components/Loading.tsx
+++ b/frontend/src/components/Loading.tsx
@@ -1,5 +1,3 @@
-import React from "react";
-
import Spinner from "src/components/Spinner";
export interface LoadingProps {
diff --git a/frontend/src/components/NofoImageLink.tsx b/frontend/src/components/NofoImageLink.tsx
deleted file mode 100644
index ca4062c88..000000000
--- a/frontend/src/components/NofoImageLink.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { pdf } from "src/constants/nofoPdfs";
-import { assetPath } from "src/utils/assetPath";
-
-import Image from "next/image";
-import Link from "next/link";
-import { Grid } from "@trussworks/react-uswds";
-
-const gridCLassName = (portrait: boolean) => {
- return `margin-bottom-4 tablet-lg:flex-${portrait ? "3" : "4"} tablet:order-${
- portrait ? "first" : "last"
- } tablet-lg:order-initial`;
-};
-
-const NofoImageLink = ({ file, image, alt, width, height }: pdf) => {
- const portrait = height > width;
-
- return (
-
-
-
-
-
- );
-};
-
-export default NofoImageLink;
diff --git a/frontend/src/components/content/FundingContent.tsx b/frontend/src/components/content/FundingContent.tsx
deleted file mode 100644
index 6a95fc05b..000000000
--- a/frontend/src/components/content/FundingContent.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { nofoPdfs } from "src/constants/nofoPdfs";
-
-import { useTranslations } from "next-intl";
-import { Grid, GridContainer } from "@trussworks/react-uswds";
-
-import NofoImageLink from "src/components/NofoImageLink";
-
-const FundingContent = () => {
- const t = useTranslations("Index");
-
- return (
-
-
-
- {t("fo_title")}
-
-
-
-
- {t("fo_paragraph_1")}
-
-
-
-
- {t("fo_paragraph_2")}
-
-
-
-
-
- {t("fo_title_2")}
-
-
- {t("fo_paragraph_3")}
-
-
- {nofoPdfs.map((pdf) => (
-
- ))}
-
-
-
-
-
- {t("fo_title_3")}
-
- {t("fo_paragraph_4")}
-
-
-
- {t("fo_title_4")}
-
-
- {t("fo_paragraph_5")}
-
-
-
-
-