Merge branch 'next' of github.com:CDCgov/phdi-site into header-style-…

…pages
CDCgov · Nov 20, 2024 · 2345b90 · 2345b90
2 parents 98f21cc + 575bd17
commit 2345b90
Show file tree

Hide file tree

Showing 10 changed files with 706 additions and 35 deletions.
diff --git a/public/images/ecr-viewer_how-it-works.gif b/public/images/ecr-viewer_how-it-works.gif
diff --git a/src/app/components/Footer/Footer.tsx b/src/app/components/Footer/Footer.tsx
@@ -17,7 +17,7 @@ export default function Footer() {
     <NavigationLink key="one" href="/" onClick={onClick}>
       Home
     </NavigationLink>,
-    <NavigationLink key="two" href="/our-products" onClick={onClick}>
+    <NavigationLink key="two" href="/products" onClick={onClick}>
       Our products
     </NavigationLink>,
     <NavigationLink key="three" href="/case-studies" onClick={onClick}>

diff --git a/src/app/components/Header/Header.tsx b/src/app/components/Header/Header.tsx
@@ -46,7 +46,7 @@ const heroContent: HeroContent = {
 const navigationItems = [
   {
     key: 'products',
-    href: '/our-products',
+    href: '/products',
     text: 'Our products',
   },
   {

diff --git a/src/app/components/NavigationLink/NavigationLink.tsx b/src/app/components/NavigationLink/NavigationLink.tsx
@@ -12,9 +12,15 @@ export function NavigationLink({
   onClick,
 }: NavigationLinkProps) {
   const pathname = usePathname();
-  const isActive = pathname === href;
+  const isActive = pathname.includes(href.toString());
+
   return (
-    <Link href={href} passHref onClick={onClick}>
+    <Link
+      href={href}
+      passHref
+      onClick={onClick}
+      {...(isActive ? { 'aria-current': 'page' } : {})}
+    >
       <span
         className={classNames('text-white', {
           underline: isActive,

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -29,7 +29,7 @@ const homeContent = {
     description:
       'DIBBs products help jurisdictions make the most of their data. From improving the usability of electronic case reporting (eCR) data to streamlining data collection from healthcare providers without the need for a direct connection, our products save jurisdictions time and effort for case investigation and analysis.',
     ctaText: 'Find out more about our products',
-    ctaHref: '/our-products',
+    ctaHref: '/products',
   },
   jurisdictions: {
     title: 'Jurisdictions working with DIBBs',
@@ -104,11 +104,7 @@ function ValueSection() {
           <p className="text-base font-normal leading-relaxed text-[#224a58] xl:max-w-[28.13rem]">
             {valueSection.description}
           </p>
-          <LinkButton
-            href={valueSection.ctaHref}
-            variant="primary"
-            className="justify-self-start"
-          >
+          <LinkButton href={valueSection.ctaHref} variant="primary">
             {valueSection.ctaText}
           </LinkButton>
         </div>

diff --git a/src/app/product-detail/page.tsx b/src/app/product-detail/page.tsx