From b54c4597ed11f5c2c76a332cc63c915268ceb548 Mon Sep 17 00:00:00 2001
From: Gordon Farrell <gordon@skylight.digital>
Date: Wed, 15 Nov 2023 09:03:46 -0700
Subject: [PATCH 1/3] Update header and rename pages for dibbs site

---
 components/FooterUSWDS/FooterUSWDS.js                  |  6 +++---
 components/NavbarUSWDS/NavbarUSWDS.js                  |  8 ++++----
 .../building-blocks-links.js                           |  0
 .../software-development-kit-info.js                   |  0
 pages/{building-block-info.js => about.js}             |  6 +++---
 pages/{partner-with-us.js => engage-with-us.js}        |  2 +-
 pages/index.js                                         |  8 ++++----
 pages/{product-offerings.js => products.js}            | 10 +++++-----
 public/mobile/{product-offerings.svg => products.svg}  |  0
 9 files changed, 20 insertions(+), 20 deletions(-)
 rename components/{product-offerings => products}/building-blocks-links.js (100%)
 rename components/{product-offerings => products}/software-development-kit-info.js (100%)
 rename pages/{building-block-info.js => about.js} (98%)
 rename pages/{partner-with-us.js => engage-with-us.js} (99%)
 rename pages/{product-offerings.js => products.js} (94%)
 rename public/mobile/{product-offerings.svg => products.svg} (100%)

diff --git a/components/FooterUSWDS/FooterUSWDS.js b/components/FooterUSWDS/FooterUSWDS.js
index bca2597..b68b9ae 100644
--- a/components/FooterUSWDS/FooterUSWDS.js
+++ b/components/FooterUSWDS/FooterUSWDS.js
@@ -19,17 +19,17 @@ export default function FooterUSWDS() {
                     Home
                 </a>
             </Link>,
-            <Link href='/building-block-info' key='building-block'>
+            <Link href='/about' key='building-block'>
                 <a className="font-public-sans-md padding-x-0 desktop:padding-x-05 usa-footer__primary-link text-base-lightest">
                     What is a building block?
                 </a>
             </Link>,
-            <Link href='/product-offerings' key='product-offerings'>
+            <Link href='/products' key='product-offerings'>
                 <a className="font-public-sans-md padding-x-0 desktop:padding-x-05 usa-footer__primary-link text-base-lightest">
                     Our product offerings
                 </a>
             </Link>,
-            <Link href='/partner-with-us' key='partner'>
+            <Link href='/engage-with-us' key='partner'>
                 <a className="font-public-sans-md padding-x-0 desktop:padding-x-05 usa-footer__primary-link text-base-lightest">
                     Partner with us
                 </a>
diff --git a/components/NavbarUSWDS/NavbarUSWDS.js b/components/NavbarUSWDS/NavbarUSWDS.js
index 351f6e4..e09fe66 100644
--- a/components/NavbarUSWDS/NavbarUSWDS.js
+++ b/components/NavbarUSWDS/NavbarUSWDS.js
@@ -15,9 +15,9 @@ export default function Navbar({ }) {
                 <span className={styles.navbarItemText}>Home</span>
             </a>
         </Link>,
-        <NavigationLink key="two" href='/building-block-info' text='What is a Building Block' router={router} onClick={onClick} />,
-        <NavigationLink key="three" href='/product-offerings' text='Our product offerings' router={router} onClick={onClick} />,
-        <NavigationLink key="four" href='/partner-with-us' text='Partner with us' router={router} onClick={onClick} />,
+        <NavigationLink key="two" href='/about' text='About' router={router} onClick={onClick} />,
+        <NavigationLink key="three" href='/products' text='Products' router={router} onClick={onClick} />,
+        <NavigationLink key="four" href='/engage-with-us' text='Engage with us' router={router} onClick={onClick} />,
     ]
 
     return (
@@ -31,7 +31,7 @@ export default function Navbar({ }) {
                             <Link href='/'>
                                 <a className="desktop:padding-1">
                                     <span className={styles.navbarLogoText} href='/phdi-site'>
-                                        Public Health Data Infrastructure
+                                        Data Integration Building Blocks
                                     </span>
                                 </a>
                             </Link>
diff --git a/components/product-offerings/building-blocks-links.js b/components/products/building-blocks-links.js
similarity index 100%
rename from components/product-offerings/building-blocks-links.js
rename to components/products/building-blocks-links.js
diff --git a/components/product-offerings/software-development-kit-info.js b/components/products/software-development-kit-info.js
similarity index 100%
rename from components/product-offerings/software-development-kit-info.js
rename to components/products/software-development-kit-info.js
diff --git a/pages/building-block-info.js b/pages/about.js
similarity index 98%
rename from pages/building-block-info.js
rename to pages/about.js
index 585b82d..93130f1 100644
--- a/pages/building-block-info.js
+++ b/pages/about.js
@@ -10,11 +10,11 @@ import organizationIcon from '../public/icons/organization.svg';
 import Link from 'next/link';
 import Head from 'next/head';
 
-export default function BuildingBlockInfo() {
+export default function About() {
   return (
     <div>
       <Head>
-        <title>Building Blocks - Public Health Data Infrastructure</title>
+        <title>Building Blocks - Data Integration Building Blocks</title>
       </Head>
       <div className="grid-container padding-x-205 margin-y-5 desktop:padding-top-5 maxw-widescreen desktop:padding-x-9 desktop:margin-y-7 desktop:margin-y-0">
         <div className="grid-row">
@@ -200,7 +200,7 @@ export default function BuildingBlockInfo() {
                     You can now test out Building Blocks in your
                     jurisdiction&apos;s data environment
                   </p>
-                  <Link href="/product-offerings">
+                  <Link href="/products">
                     <Button
                       outline
                       className={`${styles.buttonAccent} desktop:padding-x-4 padding-y-2`}
diff --git a/pages/partner-with-us.js b/pages/engage-with-us.js
similarity index 99%
rename from pages/partner-with-us.js
rename to pages/engage-with-us.js
index 7645945..d7283b5 100644
--- a/pages/partner-with-us.js
+++ b/pages/engage-with-us.js
@@ -14,7 +14,7 @@ export default function GetInvolved() {
   return (
     <>
       <Head>
-        <title>Partner with us - Public Health Data Infrastructure</title>
+        <title>Engage with us - Data Integration Building Blocks</title>
       </Head>
       <div className="desktop:padding-bottom-9 desktop:padding-top-3">
         <div className="grid-container padding-0 maxw-desktop-lg">
diff --git a/pages/index.js b/pages/index.js
index 1d66225..02b9ca1 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -21,7 +21,7 @@ export default function Home() {
   return (
     <div>
       <Head>
-        <title>Public Health Data Infrastructure</title>
+        <title>Data Integration Building Blocks</title>
       </Head>
       <div className="grid-container margin-y-5 desktop:margin-y-0 maxw-desktop-lg padding-x-205 desktop:padding-x-0">
         <div className="grid-row desktop:display-none">
@@ -34,7 +34,7 @@ export default function Home() {
             <h1
               className={`${styles.headerText} ${styles.dynamicHeader} header-line-height text-accent-cool-darker font-bold maxw-mobile-lg padding-x-1 desktop:padding-x-0`}
             >
-              Reponse-ready public health data systems
+              Response-ready public health data systems
             </h1>
             <p
               className={`font-public-sans line-height-sans-6 font-semibold ${styles.letterSpacingNeg1} padding-right-1 desktop:padding-right-0`}
@@ -112,7 +112,7 @@ export default function Home() {
                   <br />
                   <br />
                   <div className="font-semibold text-underline text-primary link">
-                    <Link href="/building-block-info">
+                    <Link href="/about">
                       More about Building Blocks ›
                     </Link>
                   </div>
@@ -193,7 +193,7 @@ export default function Home() {
               and share public health data.
             </p>
             <div className="text-center margin-top-3 width-card-lg margin-x-auto">
-              <Link href="/partner-with-us">
+              <Link href="/engage-with-us">
                 <Button
                   outline
                   className={`${styles.buttonAccent} desktop:padding-x-4 padding-y-2`}
diff --git a/pages/product-offerings.js b/pages/products.js
similarity index 94%
rename from pages/product-offerings.js
rename to pages/products.js
index 80daedd..c256599 100644
--- a/pages/product-offerings.js
+++ b/pages/products.js
@@ -1,8 +1,8 @@
 import styles from '../styles/Home.module.scss';
 import productOfferingsImage from '../public/products.svg';
-import mobileProductOfferingsImage from '../public/mobile/product-offerings.svg';
-import {SoftwareDevelopmentKitInfo} from "../components/product-offerings/software-development-kit-info";
-import {BuildingBlocksInfo} from "../components/product-offerings/building-blocks-links";
+import mobileProductOfferingsImage from '../public/mobile/products.svg';
+import {SoftwareDevelopmentKitInfo} from "../components/products/software-development-kit-info";
+import {BuildingBlocksInfo} from "../components/products/building-blocks-links";
 
 import awsImage from '../public/icons/aws.svg';
 import azureImage from '../public/icons/azure.svg';
@@ -16,7 +16,7 @@ export default function ProductOffering() {
   return (
     <div>
       <Head>
-        <title>Our product offerings - Public Health Data Infrastructure</title>
+        <title>Our product offerings - Data Integration Building Blocks</title>
       </Head>
       <div className="grid-container padding-x-205 margin-y-5 desktop:margin-bottom-0 desktop:margin-top-9">
         <div className="grid-row">
@@ -35,7 +35,7 @@ export default function ProductOffering() {
           <div className="desktop:grid-col-6 margin-top-2 desktop:margin-top-0">
             <div className="desktop:margin-left-8 desktop:padding-top-8">
               <h1 className={`header-line-height ${styles.headerText} text-accent-cool-darker font-bold text-3xl lg:text-4xl margin-bottom-2`}>
-                Our product offerings
+                Our products
               </h1>
               <p className="text-base-darkest font-semibold">
                 Our products create a data architecture that is:{' '}
diff --git a/public/mobile/product-offerings.svg b/public/mobile/products.svg
similarity index 100%
rename from public/mobile/product-offerings.svg
rename to public/mobile/products.svg

From 6dd37e636249cbb1a83f6ce502040294e748ad87 Mon Sep 17 00:00:00 2001
From: Gordon Farrell <gordon@skylight.digital>
Date: Mon, 20 Nov 2023 12:56:13 -0700
Subject: [PATCH 2/3] lighthouse

---
 pages/products.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pages/products.js b/pages/products.js
index 9339054..02ae553 100644
--- a/pages/products.js
+++ b/pages/products.js
@@ -1,20 +1,15 @@
 import styles from '../styles/Home.module.scss';
 import productOfferingsImage from '../public/products.svg';
 import mobileProductOfferingsImage from '../public/mobile/product-offerings.svg';
-import {
-    SoftwareDevelopmentKitInfo
-} from "../components/product-offerings/software-development-kit-info";
+
 import {
     BuildingBlocksInfo
-} from "../components/product-offerings/building-blocks-links";
+} from "../components/products/building-blocks-links";
 
-import awsImage from '../public/icons/aws.svg';
-import azureImage from '../public/icons/azure.svg';
 import architectureImage from '../public/dibbs-architecture.png'
 
-import gcpImage from '../public/icons/gcp.svg';
 import Image from 'next/image';
-import {Link} from '@trussworks/react-uswds';
+
 import Head from 'next/head';
 
 export default function ProductOffering() {

From ac0071ffcfd76a45c00070b886a2192e9fe43ad6 Mon Sep 17 00:00:00 2001
From: Gordon Farrell <gordon@skylight.digital>
Date: Mon, 20 Nov 2023 12:57:37 -0700
Subject: [PATCH 3/3] lighthouse

---
 pages/products.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/products.js b/pages/products.js
index 02ae553..e3f41dd 100644
--- a/pages/products.js
+++ b/pages/products.js
@@ -1,6 +1,6 @@
 import styles from '../styles/Home.module.scss';
 import productOfferingsImage from '../public/products.svg';
-import mobileProductOfferingsImage from '../public/mobile/product-offerings.svg';
+import mobileProductOfferingsImage from '../public/mobile/products.svg';
 
 import {
     BuildingBlocksInfo