From a0146804bc8b2c2e760fda7808d1f79014da6fba Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Tue, 3 Dec 2024 14:12:59 -0500
Subject: [PATCH 01/35] initial commit

---
 app/scripts/components/common/layout-root/index.tsx  | 4 ++--
 app/scripts/components/common/page-footer/index.tsx  | 9 +++++++++
 app/scripts/components/common/uswds/footer/index.tsx | 6 ++++++
 app/scripts/components/common/uswds/index.tsx        | 1 +
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 app/scripts/components/common/page-footer/index.tsx
 create mode 100644 app/scripts/components/common/uswds/footer/index.tsx

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 6fe9add22..2452ef9cf 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -12,7 +12,7 @@ import { Outlet } from 'react-router';
 import { reveal } from '@devseed-ui/animation';
 import { getBannerFromVedaConfig, getCookieConsentFromVedaConfig } from 'veda';
 import MetaTags from '../meta-tags';
-import PageFooter from '../page-footer';
+import PageFooter from '../page-footer/index';
 const Banner = React.lazy(() => import('../banner'));
 const CookieConsent = React.lazy(() => import('../cookie-consent'));
 
@@ -98,7 +98,7 @@ function LayoutRoot(props: { children?: ReactNode }) {
           />
         )}
       </PageBody>
-      <PageFooter isHidden={hideFooter} />
+      <PageFooter />
     </Page>
   );
 }
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
new file mode 100644
index 000000000..6a81e06b8
--- /dev/null
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import { USWDSFooter } from '$components/common/uswds';
+export default function PageFooter() {
+  return (
+    <>
+      <USWDSFooter />
+    </>
+  );
+}
diff --git a/app/scripts/components/common/uswds/footer/index.tsx b/app/scripts/components/common/uswds/footer/index.tsx
new file mode 100644
index 000000000..851e3f8be
--- /dev/null
+++ b/app/scripts/components/common/uswds/footer/index.tsx
@@ -0,0 +1,6 @@
+import React from 'react';
+import { Footer } from '@trussworks/react-uswds';
+
+export function USWDSFooter(props) {
+  return <Footer {...props} />;
+}
diff --git a/app/scripts/components/common/uswds/index.tsx b/app/scripts/components/common/uswds/index.tsx
index e5410b060..3dd2c7924 100644
--- a/app/scripts/components/common/uswds/index.tsx
+++ b/app/scripts/components/common/uswds/index.tsx
@@ -2,3 +2,4 @@ export { USWDSAlert } from './alert';
 export { USWDSButtonGroup, USWDSButton } from './button';
 export { USWDSLink } from './link';
 export { USWDSBanner, USWDSBannerContent } from './banner';
+export { USWDSFooter } from './footer';

From 4e4fef7eefb783ff71caf4f50f221b8cf5163ee5 Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Tue, 3 Dec 2024 14:58:51 -0500
Subject: [PATCH 02/35] adding outstanding footer imports

---
 .../components/common/uswds/footer/index.tsx       | 14 +++++++++++++-
 app/scripts/components/common/uswds/index.tsx      |  8 +++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/scripts/components/common/uswds/footer/index.tsx b/app/scripts/components/common/uswds/footer/index.tsx
index 851e3f8be..b5b92595b 100644
--- a/app/scripts/components/common/uswds/footer/index.tsx
+++ b/app/scripts/components/common/uswds/footer/index.tsx
@@ -1,6 +1,18 @@
 import React from 'react';
-import { Footer } from '@trussworks/react-uswds';
+import { Footer, FooterNav, SocialLink, Logo, Address } from '@trussworks/react-uswds';
 
 export function USWDSFooter(props) {
   return <Footer {...props} />;
 }
+export function USWDSFooterNav(props) {
+  return <FooterNav {...props} />;
+}
+export function USWDSSocialLink(props) {
+  return <SocialLink {...props} />;
+}
+export function USWDSLogo(props) {
+  return <Logo {...props} />;
+}
+export function USWDSAddress(props) {
+  return <Address {...props} />;
+}
\ No newline at end of file
diff --git a/app/scripts/components/common/uswds/index.tsx b/app/scripts/components/common/uswds/index.tsx
index 3dd2c7924..a876299e6 100644
--- a/app/scripts/components/common/uswds/index.tsx
+++ b/app/scripts/components/common/uswds/index.tsx
@@ -2,4 +2,10 @@ export { USWDSAlert } from './alert';
 export { USWDSButtonGroup, USWDSButton } from './button';
 export { USWDSLink } from './link';
 export { USWDSBanner, USWDSBannerContent } from './banner';
-export { USWDSFooter } from './footer';
+export {
+  USWDSFooter,
+  USWDSSocialLink,
+  USWDSLogo,
+  USWDSAddress,
+  USWDSFooterNav
+} from './footer';

From 7f300ea92a8386c84e7027fcb36a8857787f703f Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Wed, 4 Dec 2024 17:57:28 -0500
Subject: [PATCH 03/35] pushing up initial slim work

---
 .../components/common/layout-root/index.tsx   |   2 +-
 .../components/common/page-footer/index.tsx   |  44 +++-
 .../components/common/page-footer/styles.scss |   7 +
 .../components/common/uswds/footer/index.tsx  |  14 +-
 app/scripts/components/common/uswds/index.tsx |   3 +-
 app/scripts/components/nasa-logo-color.js     | 217 ++++++++++++++++++
 6 files changed, 280 insertions(+), 7 deletions(-)
 create mode 100644 app/scripts/components/common/page-footer/styles.scss
 create mode 100644 app/scripts/components/nasa-logo-color.js

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 2452ef9cf..7dba7447b 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -98,7 +98,7 @@ function LayoutRoot(props: { children?: ReactNode }) {
           />
         )}
       </PageBody>
-      <PageFooter />
+      <PageFooter hideFooter />
     </Page>
   );
 }
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 6a81e06b8..6d3bc5fea 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,9 +1,47 @@
 import React from 'react';
-import { USWDSFooter } from '$components/common/uswds';
-export default function PageFooter() {
+import NasaLogoColor from '../../nasa-logo-color';
+
+import {
+  USWDSFooter,
+  USWDSLink,
+  USWDSFooterNav,
+  USWDSLogo
+} from '$components/common/uswds';
+export default function PageFooter(hideFooter) {
   return (
     <>
-      <USWDSFooter />
+      {/* //commenting out hidefooter functionality for inflight work{!hideFooter && ( */}
+      <USWDSFooter
+        size='slim'
+        // returnToTop={returnToTop}
+        primary={
+          <div className='usa-footer__primary-container grid-row bg-base-lightest'>
+            <div className='mobile-lg:grid-col-8'>
+              <USWDSFooterNav
+                size='slim'
+                links={Array(4).fill(
+                  <USWDSLink
+                    variant='nav'
+                    href='#'
+                    className='usa-footer__primary-link'
+                  >
+                    Primary Link
+                  </USWDSLink>
+                )}
+              />
+            </div>
+          </div>
+        }
+        secondary={
+          <USWDSLogo
+            size='slim'
+            //Nasa logo not showing.
+            image={<NasaLogoColor />}
+            heading={<p className='usa-footer__logo-heading'>Name of Agency</p>}
+          />
+        }
+      />
+      {/*  )} */}
     </>
   );
 }
diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
new file mode 100644
index 000000000..ad25b3b6f
--- /dev/null
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -0,0 +1,7 @@
+@use '$styles/veda-ui-theme-vars.scss' as themeVars;
+.usa-footer__secondary-section {
+  color: themeVars.$veda-uswds-color-base-dark;
+}
+.usa-footer__primary-section {
+  color: themeVars.$veda-uswds-color-base-lightest;
+}
\ No newline at end of file
diff --git a/app/scripts/components/common/uswds/footer/index.tsx b/app/scripts/components/common/uswds/footer/index.tsx
index b5b92595b..938b37c1f 100644
--- a/app/scripts/components/common/uswds/footer/index.tsx
+++ b/app/scripts/components/common/uswds/footer/index.tsx
@@ -1,5 +1,12 @@
 import React from 'react';
-import { Footer, FooterNav, SocialLink, Logo, Address } from '@trussworks/react-uswds';
+import {
+  Footer,
+  FooterNav,
+  SocialLink,
+  Logo,
+  Address,
+  FooterExtendedNavList
+} from '@trussworks/react-uswds';
 
 export function USWDSFooter(props) {
   return <Footer {...props} />;
@@ -15,4 +22,7 @@ export function USWDSLogo(props) {
 }
 export function USWDSAddress(props) {
   return <Address {...props} />;
-}
\ No newline at end of file
+}
+export function USWDSFooterExtendedNavList(props) {
+  return <FooterExtendedNavList {...props} />;
+}
diff --git a/app/scripts/components/common/uswds/index.tsx b/app/scripts/components/common/uswds/index.tsx
index a876299e6..08f0905e5 100644
--- a/app/scripts/components/common/uswds/index.tsx
+++ b/app/scripts/components/common/uswds/index.tsx
@@ -7,5 +7,6 @@ export {
   USWDSSocialLink,
   USWDSLogo,
   USWDSAddress,
-  USWDSFooterNav
+  USWDSFooterNav,
+  USWDSFooterExtendedNavList
 } from './footer';
diff --git a/app/scripts/components/nasa-logo-color.js b/app/scripts/components/nasa-logo-color.js
new file mode 100644
index 000000000..b85ff9b3b
--- /dev/null
+++ b/app/scripts/components/nasa-logo-color.js
@@ -0,0 +1,217 @@
+import React from 'react';
+
+export default function NasaLogoColor() {
+  return (
+    <svg
+      width={312}
+      height={258}
+      viewBox='0 0 312 258'
+      style={{
+        fillRule: 'evenodd',
+        clipRule: 'evenodd',
+        strokeLinejoin: 'round',
+        strokeMiterlimit: 2
+      }}
+    >
+      <title>NASA</title>
+      <g id='nasa-logo-pos'>
+        <path
+          d='M273.427,387C273.427,457.761 215.188,516 144.427,516C73.665,516 15.427,457.761 15.427,387C15.427,316.239 73.665,258 144.427,258C215.188,258 273.427,316.239 273.427,387Z'
+          style={{ fill: 'rgb(0,102,179)', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M146.205,269.721C146.205,270.297 145.731,270.771 145.154,270.771C144.578,270.771 144.104,270.297 144.104,269.721C144.104,269.145 144.578,268.67 145.154,268.67C145.731,268.67 146.205,269.145 146.205,269.721Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M153.48,285.643C153.48,286.353 152.896,286.936 152.187,286.936C151.477,286.936 150.893,286.353 150.893,285.643C150.893,284.934 151.477,284.35 152.187,284.35C152.896,284.35 153.48,284.934 153.48,285.643Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M172.393,311.67C172.393,312.379 171.81,312.963 171.1,312.963C170.39,312.963 169.807,312.379 169.807,311.67C169.807,310.959 170.39,310.376 171.1,310.376C171.81,310.376 172.393,310.959 172.393,311.67Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M142.002,294.615C142.002,295.191 141.528,295.666 140.951,295.666C140.375,295.666 139.901,295.191 139.901,294.615C139.901,294.039 140.375,293.564 140.951,293.564C141.528,293.564 142.002,294.039 142.002,294.615Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M153.318,300.596C153.318,301.172 152.843,301.647 152.267,301.647C151.691,301.647 151.217,301.172 151.217,300.596C151.217,300.02 151.691,299.545 152.267,299.545C152.843,299.545 153.318,300.02 153.318,300.596Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M138.607,283.865C138.607,284.574 138.023,285.158 137.314,285.158C136.604,285.158 136.021,284.574 136.021,283.865C136.021,283.156 136.604,282.572 137.314,282.572C138.023,282.572 138.607,283.156 138.607,283.865Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M121.472,294.292C121.472,294.869 120.998,295.343 120.422,295.343C119.845,295.343 119.371,294.869 119.371,294.292C119.371,293.716 119.845,293.241 120.422,293.241C120.998,293.241 121.472,293.716 121.472,294.292Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M124.544,296.394C124.544,296.97 124.069,297.444 123.493,297.444C122.917,297.444 122.442,296.97 122.442,296.394C122.442,295.817 122.917,295.343 123.493,295.343C124.069,295.343 124.544,295.817 124.544,296.394Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M127.615,298.495C127.615,299.071 127.14,299.545 126.564,299.545C125.987,299.545 125.513,299.071 125.513,298.495C125.513,297.918 125.987,297.444 126.564,297.444C127.14,297.444 127.615,297.918 127.615,298.495Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M122.927,302.536C122.927,303.112 122.453,303.587 121.877,303.587C121.3,303.587 120.826,303.112 120.826,302.536C120.826,301.959 121.3,301.485 121.877,301.485C122.453,301.485 122.927,301.959 122.927,302.536Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M98.517,319.671C98.517,320.248 98.043,320.722 97.466,320.722C96.89,320.722 96.415,320.248 96.415,319.671C96.415,319.095 96.89,318.621 97.466,318.621C98.043,318.621 98.517,319.095 98.517,319.671Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M103.044,325.168C103.044,325.744 102.569,326.218 101.993,326.218C101.417,326.218 100.942,325.744 100.942,325.168C100.942,324.591 101.417,324.117 101.993,324.117C102.569,324.117 103.044,324.591 103.044,325.168Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M99.487,413.915C99.487,414.491 99.012,414.966 98.436,414.966C97.86,414.966 97.385,414.491 97.385,413.915C97.385,413.339 97.86,412.864 98.436,412.864C99.012,412.864 99.487,413.339 99.487,413.915Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M100.134,438.404C100.134,439.115 99.549,439.699 98.84,439.699C98.131,439.699 97.547,439.115 97.547,438.404C97.547,437.696 98.131,437.113 98.84,437.113C99.549,437.113 100.134,437.696 100.134,438.404Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M86.231,450.935C86.231,451.511 85.756,451.986 85.18,451.986C84.604,451.986 84.13,451.511 84.13,450.935C84.13,450.357 84.604,449.884 85.18,449.884C85.756,449.884 86.231,450.357 86.231,450.935Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M69.58,456.027C69.58,456.736 68.996,457.32 68.287,457.32C67.578,457.32 66.994,456.736 66.994,456.027C66.994,455.316 67.578,454.732 68.287,454.732C68.996,454.732 69.58,455.316 69.58,456.027Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M66.186,444.71C66.186,445.419 65.602,446.003 64.893,446.003C64.183,446.003 63.599,445.419 63.599,444.71C63.599,444.001 64.183,443.417 64.893,443.417C65.602,443.417 66.186,444.001 66.186,444.71Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M64.246,451.904C64.246,452.48 63.772,452.954 63.195,452.954C62.619,452.954 62.145,452.48 62.145,451.904C62.145,451.327 62.619,450.853 63.195,450.853C63.772,450.853 64.246,451.327 64.246,451.904Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M51.798,445.923C51.798,446.499 51.324,446.974 50.747,446.974C50.171,446.974 49.697,446.499 49.697,445.923C49.697,445.347 50.171,444.872 50.747,444.872C51.324,444.872 51.798,445.347 51.798,445.923Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M95.283,466.129C95.283,466.705 94.809,467.18 94.233,467.18C93.656,467.18 93.182,466.705 93.182,466.129C93.182,465.553 93.656,465.078 94.233,465.078C94.809,465.078 95.283,465.553 95.283,466.129Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M108.378,456.511C108.378,457.22 107.794,457.804 107.085,457.804C106.376,457.804 105.792,457.22 105.792,456.511C105.792,455.802 106.376,455.218 107.085,455.218C107.794,455.218 108.378,455.802 108.378,456.511Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M109.833,468.877C109.833,469.453 109.359,469.928 108.782,469.928C108.206,469.928 107.731,469.453 107.731,468.877C107.731,468.301 108.206,467.828 108.782,467.828C109.359,467.828 109.833,468.301 109.833,468.877Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M163.664,457.077C163.664,457.654 163.19,458.128 162.613,458.128C162.037,458.128 161.563,457.654 161.563,457.077C161.563,456.499 162.037,456.027 162.613,456.027C163.19,456.027 163.664,456.499 163.664,457.077Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M138.607,465.967C138.607,466.545 138.132,467.018 137.556,467.018C136.98,467.018 136.506,466.545 136.506,465.967C136.506,465.391 136.98,464.918 137.556,464.918C138.132,464.918 138.607,465.391 138.607,465.967Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M206.017,478.739C206.017,479.315 205.543,479.789 204.966,479.789C204.39,479.789 203.915,479.315 203.915,478.739C203.915,478.162 204.39,477.688 204.966,477.688C205.543,477.688 206.017,478.162 206.017,478.739Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M211.513,429.029C211.513,429.738 210.929,430.322 210.22,430.322C209.511,430.322 208.927,429.738 208.927,429.029C208.927,428.321 209.511,427.737 210.22,427.737C210.929,427.737 211.513,428.321 211.513,429.029Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M201.167,436.061C201.167,436.639 200.693,437.113 200.116,437.113C199.54,437.113 199.066,436.639 199.066,436.061C199.066,435.487 199.54,435.012 200.116,435.012C200.693,435.012 201.167,435.487 201.167,436.061Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M211.352,438.082C211.352,438.791 210.768,439.375 210.059,439.375C209.35,439.375 208.766,438.791 208.766,438.082C208.766,437.373 209.35,436.789 210.059,436.789C210.768,436.789 211.352,437.373 211.352,438.082Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M201.167,450.611C201.167,451.187 200.693,451.661 200.116,451.661C199.54,451.661 199.066,451.187 199.066,450.611C199.066,450.034 199.54,449.56 200.116,449.56C200.693,449.56 201.167,450.034 201.167,450.611Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M227.517,421.998C227.517,422.574 227.043,423.049 226.467,423.049C225.889,423.049 225.414,422.574 225.414,421.998C225.414,421.422 225.889,420.947 226.467,420.947C227.043,420.947 227.517,421.422 227.517,421.998Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M230.104,428.383C230.104,429.094 229.52,429.676 228.811,429.676C228.101,429.676 227.517,429.094 227.517,428.383C227.517,427.674 228.101,427.09 228.811,427.09C229.52,427.09 230.104,427.674 230.104,428.383Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M248.209,435.981C248.209,436.69 247.625,437.274 246.915,437.274C246.205,437.274 245.621,436.69 245.621,435.981C245.621,435.272 246.205,434.688 246.915,434.688C247.625,434.688 248.209,435.272 248.209,435.981Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M229.781,449.48C229.781,450.056 229.306,450.53 228.73,450.53C228.154,450.53 227.679,450.056 227.679,449.48C227.679,448.904 228.154,448.429 228.73,448.429C229.306,448.429 229.781,448.904 229.781,449.48Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M241.419,438.487C241.419,439.063 240.945,439.537 240.368,439.537C239.792,439.537 239.318,439.063 239.318,438.487C239.318,437.91 239.792,437.436 240.368,437.436C240.945,437.436 241.419,437.91 241.419,438.487Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M239.318,455.46C239.318,456.036 238.843,456.511 238.267,456.511C237.691,456.511 237.216,456.036 237.216,455.46C237.216,454.884 237.691,454.409 238.267,454.409C238.843,454.409 239.318,454.884 239.318,455.46Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M168.848,282.647C169.026,281.99 169.558,281.478 170.227,281.329L170.594,278.562L171.137,281.355C171.785,281.54 172.287,282.07 172.434,282.733L175.235,283.13L172.408,283.628C172.23,284.267 171.717,284.765 171.07,284.923L170.594,287.77L170.114,284.902C169.485,284.72 168.993,284.21 168.837,283.569L166.135,283.13L168.848,282.647Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M96.37,480.946C96.548,480.289 97.081,479.776 97.749,479.627L98.117,476.862L98.661,479.655C99.308,479.838 99.811,480.367 99.956,481.031L102.758,481.428L99.931,481.926C99.753,482.565 99.239,483.063 98.592,483.221L98.117,486.07L97.637,483.201C97.007,483.018 96.516,482.508 96.359,481.867L93.657,481.428L96.37,480.946Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M229.659,455.38C229.837,454.722 230.368,454.21 231.037,454.062L231.405,451.294L231.949,454.087C232.596,454.271 233.099,454.802 233.244,455.466L236.045,455.863L233.219,456.361C233.04,456.999 232.528,457.497 231.88,457.655L231.405,460.503L230.925,457.634C230.295,457.452 229.805,456.941 229.648,456.302L226.947,455.863L229.659,455.38Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M240.211,426.869C240.388,426.211 240.92,425.699 241.588,425.551L241.956,422.783L242.5,425.576C243.148,425.762 243.651,426.291 243.796,426.955L246.597,427.352L243.771,427.85C243.592,428.488 243.079,428.987 242.433,429.145L241.956,431.992L241.477,429.123C240.847,428.942 240.357,428.432 240.2,427.791L237.497,427.352L240.211,426.869Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M109.303,321.556C109.481,320.898 110.013,320.387 110.681,320.237L111.049,317.471L111.593,320.264C112.241,320.448 112.743,320.978 112.889,321.642L115.69,322.039L112.863,322.536C112.685,323.175 112.172,323.674 111.525,323.832L111.049,326.679L110.569,323.811C109.94,323.628 109.449,323.118 109.293,322.478L106.59,322.039L109.303,321.556Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M100.756,381.578C110.286,398.228 121.393,410.411 130.341,421.988C138.283,432.264 153.757,437.408 148.307,442.286C142.164,447.782 127.292,423.533 127.292,423.533C117.408,411.614 107.949,398.97 98.299,382.433L100.756,381.578Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M0,425.268C46.046,395.026 126.409,375.502 192.597,349.225C242.884,329.26 287.601,304.198 311.639,269.689C250.721,393.777 81.066,379.089 3.312,426.424L0,425.268Z'
+          style={{ fill: 'rgb(237,28,36)', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M107.05,363.738L130.11,363.738L146.644,405.374L152.155,410.905L122.134,410.905L127.645,405.374L125.687,400.294L109.117,400.294L107.413,406.103L111.365,410.905L95.701,410.905L101.213,405.374L111.837,368.554L107.05,363.738ZM122.751,393.004L116.078,376.098L111.184,393.004L122.751,393.004Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M214.184,363.738L238.118,363.738L254.653,405.374L260.164,410.905L230.143,410.905L235.654,405.374L233.696,400.294L217.125,400.294L215.421,406.103L219.373,410.905L203.71,410.905L209.222,405.374L219.845,368.554L214.184,363.738ZM230.759,393.004L224.087,376.098L219.192,393.004L230.759,393.004Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M75.758,393.113L75.758,368.554L70.972,363.738L86.925,363.738L82.14,368.554L82.14,405.374L87.651,410.905L66.693,410.905L48.637,380.361L48.637,405.374L53.277,410.905L36.6,410.905L42.111,405.374L42.111,368.554L37.325,363.738L58.21,363.738L75.758,393.113Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M196.553,375.835L196.063,361.15L191.12,364.562C184.156,362.127 176.051,362.219 170.364,364.91C165.071,367.415 159.36,372.704 160.055,380.22C160.752,387.736 166.577,390.645 171.826,393.024C178.582,396.086 185.936,397.121 185.827,401.167C185.757,403.741 181.485,405.587 178.165,405.482C175.135,405.386 165.28,404.646 160.125,398.523L161.101,413.97L166.604,409.935C173.289,412.3 181.392,413.292 188.889,410.847C196.341,408.419 204.174,402.183 199.827,391.285C197.956,386.596 192.804,383.705 189.731,382.447C186.917,381.295 178.333,377.92 175.936,376.671C173.136,375.212 173.448,370.582 180.185,369.642C186.288,368.791 194.742,373.678 196.553,375.835Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M35.658,497.677C128.131,403.298 265.971,359.693 311.639,269.689C284.138,357.193 136.85,405.454 35.408,502.115L35.658,497.677Z'
+          style={{ fill: 'rgb(237,28,36)', fillRule: 'nonzero' }}
+        />
+        <path
+          d='M98.299,382.433C97.216,380.577 96.131,378.672 95.042,376.714C70.388,332.361 73.944,287.098 118.563,306.82C156.431,323.559 192.6,370.511 207.146,403.857C213.887,419.307 231.96,479.946 173.764,455.374L173.65,455.019C228.613,477.651 219.111,420.301 189.691,376.331C173.042,351.45 151.331,330.725 137.637,320.722C92.05,287.421 64.246,307.79 96.253,373.097C97.702,376.053 99.208,378.875 100.756,381.578L98.299,382.433Z'
+          style={{ fill: 'white', fillRule: 'nonzero' }}
+        />
+      </g>
+    </svg>
+  );
+}

From 545697e7dfaf61d45b6da66692d45957d8331773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 5 Dec 2024 10:28:30 +0100
Subject: [PATCH 04/35] Move uswds footer behind feature flag

renamed old footer to PageFooterLegacy
---
 .env                                                |  2 ++
 app/scripts/components/common/layout-root/index.tsx | 13 +++++++++++--
 .../{page-footer.js => page-footer-legacy.js}       |  6 +++---
 app/scripts/components/common/page-footer/index.tsx |  4 +---
 4 files changed, 17 insertions(+), 8 deletions(-)
 rename app/scripts/components/common/{page-footer.js => page-footer-legacy.js} (97%)

diff --git a/.env b/.env
index ce7e2b852..9ec186299 100644
--- a/.env
+++ b/.env
@@ -14,3 +14,5 @@ GOOGLE_FORM = 'https://docs.google.com/forms/d/e/1FAIpQLSfGcd3FDsM3kQIOVKjzdPn4f
 
 SHOW_CONFIGURABLE_COLOR_MAP = 'TRUE'
 
+# Enables the refactor page footer component that uses the USWDS design system
+ENABLE_USWDS_PAGE_FOOTER = 'TRUE'
\ No newline at end of file
diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 7dba7447b..d3f7cc19e 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -11,8 +11,11 @@ import styled from 'styled-components';
 import { Outlet } from 'react-router';
 import { reveal } from '@devseed-ui/animation';
 import { getBannerFromVedaConfig, getCookieConsentFromVedaConfig } from 'veda';
+
 import MetaTags from '../meta-tags';
-import PageFooter from '../page-footer/index';
+import PageFooter from '../page-footer';
+import PageFooterLegacy from '../page-footer-legacy';
+
 const Banner = React.lazy(() => import('../banner'));
 const CookieConsent = React.lazy(() => import('../cookie-consent'));
 
@@ -26,9 +29,11 @@ import {
   mainNavItems,
   subNavItems
 } from '$components/common/page-header/default-config';
+import { checkEnvFlag } from '$utils/utils';
 
 const appTitle = process.env.APP_TITLE;
 const appDescription = process.env.APP_DESCRIPTION;
+const isUSWDSEnabled = checkEnvFlag(process.env.ENABLE_USWDS_PAGE_FOOTER);
 
 export const PAGE_BODY_ID = 'pagebody';
 
@@ -98,7 +103,11 @@ function LayoutRoot(props: { children?: ReactNode }) {
           />
         )}
       </PageBody>
-      <PageFooter hideFooter />
+      {isUSWDSEnabled ? (
+        <PageFooter />
+      ) : (
+        <PageFooterLegacy hideFooter={hideFooter} />
+      )}
     </Page>
   );
 }
diff --git a/app/scripts/components/common/page-footer.js b/app/scripts/components/common/page-footer-legacy.js
similarity index 97%
rename from app/scripts/components/common/page-footer.js
rename to app/scripts/components/common/page-footer-legacy.js
index 531054103..a4b3311c7 100644
--- a/app/scripts/components/common/page-footer.js
+++ b/app/scripts/components/common/page-footer-legacy.js
@@ -109,7 +109,7 @@ const InfoList = styled.dl`
   }
 `;
 
-function PageFooter(props) {
+function PageFooterLegacy(props) {
   const nowDate = new Date();
 
   return (
@@ -174,8 +174,8 @@ function PageFooter(props) {
   );
 }
 
-export default PageFooter;
+export default PageFooterLegacy;
 
-PageFooter.propTypes = {
+PageFooterLegacy.propTypes = {
   isHidden: T.bool
 };
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 6d3bc5fea..1afe9fcea 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -7,10 +7,9 @@ import {
   USWDSFooterNav,
   USWDSLogo
 } from '$components/common/uswds';
-export default function PageFooter(hideFooter) {
+export default function PageFooter() {
   return (
     <>
-      {/* //commenting out hidefooter functionality for inflight work{!hideFooter && ( */}
       <USWDSFooter
         size='slim'
         // returnToTop={returnToTop}
@@ -41,7 +40,6 @@ export default function PageFooter(hideFooter) {
           />
         }
       />
-      {/*  )} */}
     </>
   );
 }

From 6f589109871e2e20529fb31a755ab75aaba43cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 5 Dec 2024 10:52:25 +0100
Subject: [PATCH 05/35] Disable eslint to not warn, explanation in comment

---
 app/scripts/components/common/layout-root/index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index d3f7cc19e..ec9e01a62 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -63,7 +63,8 @@ function LayoutRoot(props: { children?: ReactNode }) {
   useEffect(() => {
     // When there is no cookie consent form set up
     !cookieConsentContent && setGoogleTagManager();
-  }, []);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []); // Empty dependency array ensures this effect runs only once, and not during SSR
 
   const { title, thumbnail, description, hideFooter } =
     useContext(LayoutRootContext);

From f838337c4a31f09a1c40ab395911038c56eaf272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 5 Dec 2024 12:17:42 +0100
Subject: [PATCH 06/35] Move Connections component behind the same FF

I suppose the content will be included in the new footer component
---
 app/scripts/components/home/index.tsx | 60 ++++++++++++++-------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/scripts/components/home/index.tsx b/app/scripts/components/home/index.tsx
index 891aeadcf..6d65785f4 100644
--- a/app/scripts/components/home/index.tsx
+++ b/app/scripts/components/home/index.tsx
@@ -24,8 +24,9 @@ import {
   ComponentOverride,
   ContentOverride
 } from '$components/common/page-overrides';
+import { checkEnvFlag } from '$utils/utils';
 
-
+const isUSWDSEnabled = checkEnvFlag(process.env.ENABLE_USWDS_PAGE_FOOTER);
 const homeContent = getOverride('homeContent');
 
 const Connections = styled(Hug)`
@@ -113,10 +114,10 @@ const getCoverProps = () => {
 
     return author
       ? {
-        ...coverProps,
-        attributionAuthor: author.name,
-        attributionUrl: author.url
-      }
+          ...coverProps,
+          attributionAuthor: author.name,
+          attributionUrl: author.url
+        }
       : coverProps;
   } else {
     return {
@@ -171,36 +172,37 @@ function RootHome() {
       </ComponentOverride>
 
       <ContentOverride with='homeContent'>
-
         <Audience />
 
         <FeaturedStories />
 
         <ValueProposition />
 
-        <Connections>
-          <ConnectionsBlock>
-            <ConnectionsBlockTitle>About</ConnectionsBlockTitle>
-            <ConnectionsList>
-              <li>
-                <Link to='/about'>
-                  <CollecticonChevronRightSmall /> Learn more
-                </Link>
-              </li>
-              <li>
-                <a
-                  href='#'
-                  onClick={(e) => {
-                    e.preventDefault();
-                    showFeedbackModal();
-                  }}
-                >
-                  <CollecticonChevronRightSmall /> Give feedback
-                </a>
-              </li>
-            </ConnectionsList>
-          </ConnectionsBlock>
-        </Connections>
+        {!isUSWDSEnabled && (
+          <Connections>
+            <ConnectionsBlock>
+              <ConnectionsBlockTitle>About</ConnectionsBlockTitle>
+              <ConnectionsList>
+                <li>
+                  <Link to='/about'>
+                    <CollecticonChevronRightSmall /> Learn more
+                  </Link>
+                </li>
+                <li>
+                  <a
+                    href='#'
+                    onClick={(e) => {
+                      e.preventDefault();
+                      showFeedbackModal();
+                    }}
+                  >
+                    <CollecticonChevronRightSmall /> Give feedback
+                  </a>
+                </li>
+              </ConnectionsList>
+            </ConnectionsBlock>
+          </Connections>
+        )}
       </ContentOverride>
     </PageMainContent>
   );

From e856157c7675434d6ab6488ef86a96e7ceeefb1d Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Thu, 5 Dec 2024 10:47:25 -0500
Subject: [PATCH 07/35] usa foot implementation

---
 .../components/common/page-footer/index.tsx   |  1 +
 .../components/common/page-footer/styles.scss |  1 +
 app/scripts/styles/styles.scss                | 21 +++++++++----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 6d3bc5fea..90f4ba1a7 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -11,6 +11,7 @@ export default function PageFooter(hideFooter) {
   return (
     <>
       {/* //commenting out hidefooter functionality for inflight work{!hideFooter && ( */}
+      {NasaLogoColor}
       <USWDSFooter
         size='slim'
         // returnToTop={returnToTop}
diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index ad25b3b6f..61089920d 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -1,4 +1,5 @@
 @use '$styles/veda-ui-theme-vars.scss' as themeVars;
+
 .usa-footer__secondary-section {
   color: themeVars.$veda-uswds-color-base-dark;
 }
diff --git a/app/scripts/styles/styles.scss b/app/scripts/styles/styles.scss
index 16c5d7607..25fbe6566 100644
--- a/app/scripts/styles/styles.scss
+++ b/app/scripts/styles/styles.scss
@@ -1,13 +1,12 @@
 @forward 'uswds-theme';
 
-@use "uswds-utilities";
-@use "usa-layout-grid";
-@use "usa-banner";
-@use "usa-button";
-@use "usa-card";
-@use "usa-alert";
-@use "usa-button-group";
-@use "usa-icon";
-@use "usa-modal";
-
-
+@use 'uswds-utilities';
+@use 'usa-layout-grid';
+@use 'usa-banner';
+@use 'usa-button';
+@use 'usa-card';
+@use 'usa-alert';
+@use 'usa-button-group';
+@use 'usa-icon';
+@use 'usa-modal';
+@use 'usa-footer';

From 65daceaf7a35cda4356d27c4cd4a30670cf9cbca Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Mon, 9 Dec 2024 12:35:32 -0500
Subject: [PATCH 08/35] adding uswds style infrastructure

---
 .../components/common/page-footer/index.tsx   | 85 ++++++++++++++-----
 .../components/common/page-footer/styles.scss | 50 ++++++++++-
 app/scripts/styles/_uswds-theme.scss          | 35 ++++----
 app/scripts/styles/_veda-ui-theme-vars.scss   | 40 +++++++++
 4 files changed, 169 insertions(+), 41 deletions(-)
 create mode 100644 app/scripts/styles/_veda-ui-theme-vars.scss

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 90f4ba1a7..c182a966b 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,48 +1,87 @@
-import React from 'react';
-import NasaLogoColor from '../../nasa-logo-color';
+import React, { ComponentType } from 'react';
+import NasaLogoColor from '../../nasa-logo-color.js';
+import { Icon } from '@trussworks/react-uswds';
 
 import {
   USWDSFooter,
   USWDSLink,
   USWDSFooterNav,
-  USWDSLogo
+  USWDSLogo,
+  USWDSAddress
 } from '$components/common/uswds';
-export default function PageFooter(hideFooter) {
+import './styles.scss';
+
+export default function PageFooter() {
+  const returnToTop = () => {
+    return (
+      <div className='maxw-desktop margin-left-auto margin-right-auto padding-x-4'>
+        <a className='usa-link text-primary' href='#'>
+          Return to top
+        </a>
+      </div>
+    );
+  };
   return (
     <>
-      {/* //commenting out hidefooter functionality for inflight work{!hideFooter && ( */}
-      {NasaLogoColor}
       <USWDSFooter
         size='slim'
-        // returnToTop={returnToTop}
+        returnToTop={returnToTop()}
         primary={
-          <div className='usa-footer__primary-container grid-row bg-base-lightest'>
-            <div className='mobile-lg:grid-col-8'>
+          <div
+            id='footer_primary_container'
+            className=' grid-row bg-base-lightest'
+          >
+            <div className='grid-row'>
               <USWDSFooterNav
                 size='slim'
+                className='flex'
                 links={Array(4).fill(
-                  <USWDSLink
-                    variant='nav'
-                    href='#'
-                    className='usa-footer__primary-link'
-                  >
+                  <a className='usa-footer__primary-link' href='#'>
                     Primary Link
-                  </USWDSLink>
+                  </a>
                 )}
               />
+              <div className='flex'>
+                <USWDSAddress
+                  size='slim'
+                  className=''
+                  items={[
+                    <a className='usa-link text-base-dark' key='#' href='#'>
+                      News and Events
+                    </a>,
+                    <a className='usa-link text-base-dark' key='#' href='#'>
+                      About
+                    </a>,
+                    <a className='usa-link text-base-dark' key='#' href='#'>
+                      Contact Us
+                    </a>
+                  ]}
+                />
+              </div>
             </div>
           </div>
         }
         secondary={
-          <USWDSLogo
-            size='slim'
-            //Nasa logo not showing.
-            image={<NasaLogoColor />}
-            heading={<p className='usa-footer__logo-heading'>Name of Agency</p>}
-          />
+          <div className='grid-row'>
+            <div id='logo-container'>
+              <a id='logo-container-link' href='#'>
+                {NasaLogoColor()}
+                <span className='footer-text'>
+                  NASA EarthData 2024 • v0.17.0
+                  {/* {version} */}
+                </span>
+              </a>
+            </div>
+            <div className='grid-col-4 footer-text flex'>
+              <span>NASA Official:</span>
+              <a key='email' href='mailto:info@agency.gov'>
+                <Icon.Mail />
+                info@agency.gov
+              </a>
+            </div>
+          </div>
         }
       />
-      {/*  )} */}
     </>
   );
-}
+}
\ No newline at end of file
diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index 61089920d..19cac1c6c 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -1,8 +1,54 @@
 @use '$styles/veda-ui-theme-vars.scss' as themeVars;
 
 .usa-footer__secondary-section {
-  color: themeVars.$veda-uswds-color-base-dark;
+  background-color: themeVars.$veda-uswds-color-base-darkest;
 }
 .usa-footer__primary-section {
-  color: themeVars.$veda-uswds-color-base-lightest;
+  background-color: themeVars.$veda-uswds-color-base-lightest;
+}
+
+#logo-container {
+  display: flex;
+  font-family: themeVars.$veda-uswds-basefont-sans;
+  gap: themeVars.$veda-uswds-spacing-105;
+
+  #logo-container-link {
+    display: flex;
+    align-items: center;
+    gap: themeVars.$veda-uswds-spacing-105;
+    font-weight: themeVars.$veda-uswds-fontweight-bold;
+    font-size: themeVars.$veda-uswds-fontsize-lg;
+  }
+
+  #nasa-logo-pos {
+    opacity: 1;
+    transform: translate(0, -100%);
+    /* TODO: Fix the svg to not require any styles!
+     * - set opacity to 1 in svg and fix translation
+     */
+  }
+
+  // @media (width <= themeVars.$veda-uswds-spacing-desktop) {
+  //   #nasa-logo-pos {
+  //     display: none;
+  //   }
+  // }
+
+  svg {
+    height: 2.75rem;
+    width: auto;
+  }
+}
+.footer-text {
+  color: white;
+  align-self: center;
+  font-size: themeVars.$veda-uswds-fontsize-sm;
+  font-weight: themeVars.$veda-uswds-fontweight-regular;
+}
+
+#return-to-top-container {
+}
+#footer_primary_container {
+  padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
+  background-color: themeVars.$veda-uswds-color-base-lightest;
 }
\ No newline at end of file
diff --git a/app/scripts/styles/_uswds-theme.scss b/app/scripts/styles/_uswds-theme.scss
index 39e5f6eb6..7057bfd06 100644
--- a/app/scripts/styles/_uswds-theme.scss
+++ b/app/scripts/styles/_uswds-theme.scss
@@ -1,19 +1,22 @@
+// @QUESTION: Move to under uswds dir?
 @use 'uswds-core' as * with (
-    $utilities-use-important: true,
-    $theme-show-notifications: false,
-    // To add more custom fonts, see 'Adding fonts to USWDS':
-    // https://designsystem.digital.gov/design-tokens/typesetting/font-family/
-    $theme-typeface-tokens: (
-        baseFontFamily: (
-            "display-name": var(--base-font-family),
-            "cap-height": 364px,
-        ),
+  $utilities-use-important: true,
+  $theme-show-notifications: false,
+  $theme-font-weight-semibold: '600',
+  // To add more custom fonts, see 'Adding fonts to USWDS':
+  // https://designsystem.digital.gov/design-tokens/typesetting/font-family/
+  $theme-typeface-tokens:
+    (
+      baseFontFamily: (
+        'display-name': var(--base-font-family),
+        'cap-height': 364px
+      )
     ),
-    $theme-type-scale-md: 8,
-    $theme-utility-breakpoints: (
-        "mobile-lg": false,
-        "desktop": false
-    ),
-    $theme-font-type-sans: baseFontFamily,
-    $theme-font-type-serif: baseFontFamily,
+  $theme-type-scale-md: 8,
+  $theme-utility-breakpoints: (
+    'mobile-lg': false,
+    'desktop': false
+  ),
+  $theme-font-type-serif: baseFontFamily,
+  $theme-font-type-sans: baseFontFamily
 );
\ No newline at end of file
diff --git a/app/scripts/styles/_veda-ui-theme-vars.scss b/app/scripts/styles/_veda-ui-theme-vars.scss
new file mode 100644
index 000000000..3a5f4f4b8
--- /dev/null
+++ b/app/scripts/styles/_veda-ui-theme-vars.scss
@@ -0,0 +1,40 @@
+@forward 'uswds-theme';
+@use 'uswds-core/src/styles/functions/utilities' as utils;
+@use 'uswds-core/src/styles/functions/units' as spacing;
+
+/*********** VEDAUI THEME PALETTE ***********/
+// These map to the veda defined styles between https://www.figma.com/design/5mclPTReHcRIzKbJm8YA6a/VEDA---USWDS?node-id=139-14&node-type=canvas&t=7Qa02mMKUgBy5Qho-0
+// and uswds found at https://designsystem.digital.gov/design-tokens/
+
+// TYPOGRAPHY
+$veda-uswds-basefont-sans: utils.family('sans');
+
+// // FONT-SIZE
+$veda-uswds-fontsize-3xs: utils.size('body', '3xs');
+$veda-uswds-fontsize-lg: utils.size('body', 'lg');
+$veda-uswds-fontsize-sm: utils.size('body', 'sm');
+
+// FONT-WEIGHT
+$veda-uswds-fontweight-light: utils.font-weight('light');
+$veda-uswds-fontweight-regular: utils.font-weight('normal');
+$veda-uswds-fontweight-bold: utils.font-weight('bold');
+$veda-uswds-fontweight-semibold: utils.font-weight('semibold');
+
+// COLORS
+$veda-uswds-color-primary-darker: utils.color('primary-darker');
+$veda-uswds-color-secondary: utils.color('secondary');
+$veda-uswds-color-base-dark: utils.color('base-dark');
+$veda-uswds-color-primary-light: utils.color('primary-light');
+$veda-uswds-color-base-darkest: utils.color('base-darkest');
+$veda-uswds-color-base-light: utils.color('base-light');
+$veda-uswds-color-base-lightest: utils.color('base-lightest');
+$veda-uswds-color-base-ink: utils.color('ink');
+
+// SPACING
+$veda-uswds-spacing-5: spacing.units(0.5);
+$veda-uswds-spacing-105: spacing.units(1.5);
+$veda-uswds-spacing-desktop: spacing.units('desktop');
+
+//PADDING
+$veda-uswds-padding-4: spacing.units(4);
+$veda-uswds-padding-5: spacing.units(5);
\ No newline at end of file

From 18f0173ea701e2729256519612eacc975da44847 Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Mon, 9 Dec 2024 15:15:31 -0500
Subject: [PATCH 09/35] implementing styling and creating interface

---
 .../components/common/layout-root/index.tsx   |  2 +-
 .../components/common/page-footer/index.tsx   | 75 ++++++++++++-------
 .../components/common/page-footer/styles.scss | 27 +++++--
 app/scripts/styles/_uswds-theme.scss          |  4 +-
 app/scripts/styles/_veda-ui-theme-vars.scss   |  1 +
 app/scripts/styles/styles.scss                |  5 ++
 6 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index ec9e01a62..6e0f9fc36 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -105,7 +105,7 @@ function LayoutRoot(props: { children?: ReactNode }) {
         )}
       </PageBody>
       {isUSWDSEnabled ? (
-        <PageFooter />
+        <PageFooter hideFooter={hideFooter}  />
       ) : (
         <PageFooterLegacy hideFooter={hideFooter} />
       )}
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index c182a966b..e9da4c114 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,7 +1,6 @@
 import React, { ComponentType } from 'react';
-import NasaLogoColor from '../../nasa-logo-color.js';
 import { Icon } from '@trussworks/react-uswds';
-
+import NasaLogoColor from '../../nasa-logo-color.js';
 import {
   USWDSFooter,
   USWDSLink,
@@ -11,58 +10,73 @@ import {
 } from '$components/common/uswds';
 import './styles.scss';
 
-export default function PageFooter() {
+interface PageFooterProps {
+  mainNavItems: NavItem[];
+  subNavItems: NavItem[];
+  logoSvg?: SVGElement | JSX.Element;
+  linkProperties: LinkProperties;
+  title: string;
+  version?: string;
+  hidefooter?: boolean;
+}
+
+export default function PageFooter({ hidefooter }: PageFooterProps) {
   const returnToTop = () => {
     return (
-      <div className='maxw-desktop margin-left-auto margin-right-auto padding-x-4'>
+      <div
+        id='return-to-top-container'
+        className=' margin-left-auto margin-right-auto padding-x-4'
+      >
         <a className='usa-link text-primary' href='#'>
           Return to top
         </a>
       </div>
     );
   };
+
   return (
     <>
       <USWDSFooter
         size='slim'
         returnToTop={returnToTop()}
+        // className={hidefooter && 'display-none'}
         primary={
           <div
             id='footer_primary_container'
             className=' grid-row bg-base-lightest'
           >
-            <div className='grid-row'>
+            <div className='mobile-lg:grid-col-8'>
               <USWDSFooterNav
+                aria-label='Footer navigation'
                 size='slim'
-                className='flex'
                 links={Array(4).fill(
                   <a className='usa-footer__primary-link' href='#'>
-                    Primary Link
+                    PrimaryLink
                   </a>
                 )}
               />
-              <div className='flex'>
-                <USWDSAddress
-                  size='slim'
-                  className=''
-                  items={[
-                    <a className='usa-link text-base-dark' key='#' href='#'>
-                      News and Events
-                    </a>,
-                    <a className='usa-link text-base-dark' key='#' href='#'>
-                      About
-                    </a>,
-                    <a className='usa-link text-base-dark' key='#' href='#'>
-                      Contact Us
-                    </a>
-                  ]}
-                />
-              </div>
+            </div>
+            <div className='tablet:grid-col-4'>
+              <USWDSAddress
+                size='slim'
+                className='flex-justify-end'
+                items={[
+                  <a className='usa-link text-base-dark' key='#' href='#'>
+                    News and Events
+                  </a>,
+                  <a className='usa-link text-base-dark' key='#' href='#'>
+                    About
+                  </a>,
+                  <a className='usa-link text-base-dark' key='#' href='#'>
+                    Contact Us
+                  </a>
+                ]}
+              />
             </div>
           </div>
         }
         secondary={
-          <div className='grid-row'>
+          <div id='footer_secondary_container' className='grid-row'>
             <div id='logo-container'>
               <a id='logo-container-link' href='#'>
                 {NasaLogoColor()}
@@ -72,10 +86,13 @@ export default function PageFooter() {
                 </span>
               </a>
             </div>
-            <div className='grid-col-4 footer-text flex'>
-              <span>NASA Official:</span>
+            <div className='grid-col-4 footer-text grid-gap-6'>
+              <span>NASA Official: </span>
               <a key='email' href='mailto:info@agency.gov'>
-                <Icon.Mail />
+                <Icon.Mail
+                  className='margin-right-1 width-205 height-auto position-relative'
+                  id='mail_icon'
+                />
                 info@agency.gov
               </a>
             </div>
@@ -84,4 +101,4 @@ export default function PageFooter() {
       />
     </>
   );
-}
\ No newline at end of file
+}
diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index 19cac1c6c..a60278b96 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -1,12 +1,5 @@
 @use '$styles/veda-ui-theme-vars.scss' as themeVars;
 
-.usa-footer__secondary-section {
-  background-color: themeVars.$veda-uswds-color-base-darkest;
-}
-.usa-footer__primary-section {
-  background-color: themeVars.$veda-uswds-color-base-lightest;
-}
-
 #logo-container {
   display: flex;
   font-family: themeVars.$veda-uswds-basefont-sans;
@@ -42,13 +35,31 @@
 .footer-text {
   color: white;
   align-self: center;
+  display: flex;
   font-size: themeVars.$veda-uswds-fontsize-sm;
   font-weight: themeVars.$veda-uswds-fontweight-regular;
+  gap: themeVars.$veda-uswds-spacing-105;
 }
 
 #return-to-top-container {
+  padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
 }
 #footer_primary_container {
   padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
   background-color: themeVars.$veda-uswds-color-base-lightest;
-}
\ No newline at end of file
+}
+#footer_secondary_container {
+  padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
+}
+
+.usa-footer__secondary-section {
+  background-color: themeVars.$veda-uswds-color-base-darkest;
+}
+.usa-footer__primary-section {
+  background-color: themeVars.$veda-uswds-color-base-lightest;
+}
+
+#mail_icon{
+  top:50%;
+  transform: translateY(-50%);
+}
diff --git a/app/scripts/styles/_uswds-theme.scss b/app/scripts/styles/_uswds-theme.scss
index 7057bfd06..16e24b038 100644
--- a/app/scripts/styles/_uswds-theme.scss
+++ b/app/scripts/styles/_uswds-theme.scss
@@ -14,8 +14,8 @@
     ),
   $theme-type-scale-md: 8,
   $theme-utility-breakpoints: (
-    'mobile-lg': false,
-    'desktop': false
+    'mobile-lg': true,
+    'desktop': true
   ),
   $theme-font-type-serif: baseFontFamily,
   $theme-font-type-sans: baseFontFamily
diff --git a/app/scripts/styles/_veda-ui-theme-vars.scss b/app/scripts/styles/_veda-ui-theme-vars.scss
index 3a5f4f4b8..cd77ee1f2 100644
--- a/app/scripts/styles/_veda-ui-theme-vars.scss
+++ b/app/scripts/styles/_veda-ui-theme-vars.scss
@@ -32,6 +32,7 @@ $veda-uswds-color-base-ink: utils.color('ink');
 
 // SPACING
 $veda-uswds-spacing-5: spacing.units(0.5);
+$veda-uswds-spacing-1: spacing.units(1);
 $veda-uswds-spacing-105: spacing.units(1.5);
 $veda-uswds-spacing-desktop: spacing.units('desktop');
 
diff --git a/app/scripts/styles/styles.scss b/app/scripts/styles/styles.scss
index 25fbe6566..20165d034 100644
--- a/app/scripts/styles/styles.scss
+++ b/app/scripts/styles/styles.scss
@@ -10,3 +10,8 @@
 @use 'usa-icon';
 @use 'usa-modal';
 @use 'usa-footer';
+@use 'usa-list';
+@use 'usa-form';
+@use 'usa-input';
+@use 'usa-label';
+@use 'uswds-fonts';

From 60398edc5b463c68119b17525bc4f6df1debec0a Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Mon, 9 Dec 2024 16:30:14 -0500
Subject: [PATCH 10/35] wiring up config

---
 .../components/common/layout-root/index.tsx   |  14 +-
 .../components/common/page-footer/index.tsx   |  30 ++--
 .../common/page-header/default-config.ts      | 163 ++++++++++++++----
 mock/veda.config.js                           |  48 ++++++
 parcel-resolver-veda/index.d.ts               |  14 ++
 parcel-resolver-veda/index.js                 |   7 +-
 6 files changed, 222 insertions(+), 54 deletions(-)

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 6e0f9fc36..e2e22223c 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -27,7 +27,10 @@ import NavWrapper from '$components/common/nav-wrapper';
 import Logo from '$components/common/page-header/logo';
 import {
   mainNavItems,
-  subNavItems
+  subNavItems,
+  footerSettings,
+  footerPrimaryContactItems,
+  footerPrimaryNavItems
 } from '$components/common/page-header/default-config';
 import { checkEnvFlag } from '$utils/utils';
 
@@ -105,7 +108,14 @@ function LayoutRoot(props: { children?: ReactNode }) {
         )}
       </PageBody>
       {isUSWDSEnabled ? (
-        <PageFooter hideFooter={hideFooter}  />
+        <PageFooter
+          settings={footerSettings}
+          primarySection={{
+            footerPrimaryContactItems,
+            footerPrimaryNavItems
+          }}
+          hideFooter={hideFooter}
+        />
       ) : (
         <PageFooterLegacy hideFooter={hideFooter} />
       )}
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index e9da4c114..9827e0347 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -3,25 +3,24 @@ import { Icon } from '@trussworks/react-uswds';
 import NasaLogoColor from '../../nasa-logo-color.js';
 import {
   USWDSFooter,
-  USWDSLink,
   USWDSFooterNav,
-  USWDSLogo,
   USWDSAddress
 } from '$components/common/uswds';
 import './styles.scss';
 
 interface PageFooterProps {
-  mainNavItems: NavItem[];
-  subNavItems: NavItem[];
-  logoSvg?: SVGElement | JSX.Element;
-  linkProperties: LinkProperties;
-  title: string;
-  version?: string;
+  primarySection: any;
+  settings: any;
   hidefooter?: boolean;
 }
 
-export default function PageFooter({ hidefooter }: PageFooterProps) {
-  const returnToTop = () => {
+export default function PageFooter({
+  settings,
+  primarySection,
+  hidefooter
+}: PageFooterProps) {
+  console.log(settings, primarySection, hidefooter);
+  const returnToTopButton = () => {
     return (
       <div
         id='return-to-top-container'
@@ -34,11 +33,13 @@ export default function PageFooter({ hidefooter }: PageFooterProps) {
     );
   };
 
+  const { returnToTop, secondarySection } = settings;
+  const { footerPrimaryContactItems, footerPrimaryNavItems } = primarySection;
   return (
     <>
       <USWDSFooter
         size='slim'
-        returnToTop={returnToTop()}
+        returnToTop={returnToTop && returnToTopButton()}
         // className={hidefooter && 'display-none'}
         primary={
           <div
@@ -88,12 +89,15 @@ export default function PageFooter({ hidefooter }: PageFooterProps) {
             </div>
             <div className='grid-col-4 footer-text grid-gap-6'>
               <span>NASA Official: </span>
-              <a key='email' href='mailto:info@agency.gov'>
+              <a
+                key={secondarySection.type}
+                href={`mailto:${secondarySection.to}`}
+              >
                 <Icon.Mail
                   className='margin-right-1 width-205 height-auto position-relative'
                   id='mail_icon'
                 />
-                info@agency.gov
+                {secondarySection.title}
               </a>
             </div>
           </div>
diff --git a/app/scripts/components/common/page-header/default-config.ts b/app/scripts/components/common/page-header/default-config.ts
index 889f884b8..9036ff267 100644
--- a/app/scripts/components/common/page-header/default-config.ts
+++ b/app/scripts/components/common/page-header/default-config.ts
@@ -1,5 +1,15 @@
-import { getString, getNavItemsFromVedaConfig } from 'veda';
-import { InternalNavLink, ExternalNavLink, ModalNavLink, DropdownNavLink, NavItemType } from '$components/common/page-header/types';
+import {
+  getString,
+  getNavItemsFromVedaConfig,
+  getFooterItemsFromVedaConfig
+} from 'veda';
+import {
+  InternalNavLink,
+  ExternalNavLink,
+  ModalNavLink,
+  DropdownNavLink,
+  NavItemType
+} from '$components/common/page-header/types';
 
 import {
   STORIES_PATH,
@@ -8,44 +18,125 @@ import {
   ABOUT_PATH
 } from '$utils/routes';
 
-let defaultMainNavItems:(ExternalNavLink | InternalNavLink | DropdownNavLink | ModalNavLink)[] = [{
-  title: 'Data Catalog',
-  to: DATASETS_PATH,
-  type: NavItemType.INTERNAL_LINK
-}, {
-  title: 'Exploration',
-  to: EXPLORATION_PATH,
-  type: NavItemType.INTERNAL_LINK
-}, {
-  title: getString('stories').other,
-  to: STORIES_PATH,
-  type: NavItemType.INTERNAL_LINK
-}];
-
-if (!!process.env.HUB_URL && !!process.env.HUB_NAME) defaultMainNavItems = [...defaultMainNavItems, {
-  title: process.env.HUB_NAME,
-  href: process.env.HUB_URL,
-  type: NavItemType.EXTERNAL_LINK
-} as ExternalNavLink];
-
-let defaultSubNavItems:(ExternalNavLink | InternalNavLink | DropdownNavLink | ModalNavLink)[] = [{
-  title: 'About',
-  to: ABOUT_PATH,
-  type: NavItemType.INTERNAL_LINK
-}];
+let defaultMainNavItems: (
+  | ExternalNavLink
+  | InternalNavLink
+  | DropdownNavLink
+  | ModalNavLink
+)[] = [
+  {
+    title: 'Data Catalog',
+    to: DATASETS_PATH,
+    type: NavItemType.INTERNAL_LINK
+  },
+  {
+    title: 'Exploration',
+    to: EXPLORATION_PATH,
+    type: NavItemType.INTERNAL_LINK
+  },
+  {
+    title: getString('stories').other,
+    to: STORIES_PATH,
+    type: NavItemType.INTERNAL_LINK
+  }
+];
+
+if (!!process.env.HUB_URL && !!process.env.HUB_NAME)
+  defaultMainNavItems = [
+    ...defaultMainNavItems,
+    {
+      title: process.env.HUB_NAME,
+      href: process.env.HUB_URL,
+      type: NavItemType.EXTERNAL_LINK
+    } as ExternalNavLink
+  ];
+
+let defaultSubNavItems: (
+  | ExternalNavLink
+  | InternalNavLink
+  | DropdownNavLink
+  | ModalNavLink
+)[] = [
+  {
+    title: 'About',
+    to: ABOUT_PATH,
+    type: NavItemType.INTERNAL_LINK
+  }
+];
 
 if (process.env.GOOGLE_FORM) {
-  defaultSubNavItems = [...defaultSubNavItems, {
-    title: 'Contact us',
-    src: process.env.GOOGLE_FORM,
-    type: NavItemType.MODAL
-  }];
+  defaultSubNavItems = [
+    ...defaultSubNavItems,
+    {
+      title: 'Contact us',
+      src: process.env.GOOGLE_FORM,
+      type: NavItemType.MODAL
+    }
+  ];
 }
 
-const mainNavItems = getNavItemsFromVedaConfig()?.mainNavItems?? defaultMainNavItems;
-const subNavItems = getNavItemsFromVedaConfig()?.subNavItems?? defaultSubNavItems;
+const defaultFooterSettings = {
+  secondarySection: {
+    title: 'email test',
+    to: '/data-catalog',
+    type: 'Email'
+  },
+  returnToTop: true
+};
+
+const defaultFooterPrimaryContactItems = [
+  {
+    title: 'News and Events',
+    to: '/data-catalog',
+    type: 'internalLink'
+  },
+  {
+    title: 'About',
+    to: '/data-catalog',
+    type: 'internalLink'
+  },
+  {
+    title: 'Contact Us',
+    to: '/data-catalog',
+    type: 'internalLink'
+  }
+];
+
+const defaultFooterPrimaryNavItems = [
+  {
+    title: 'Stories',
+    to: '/data-catalog',
+    type: 'internalLink'
+  },
+  {
+    title: 'Topics',
+    to: '/data-catalog',
+    type: 'internalLink'
+  },
+  {
+    title: 'Data Toolkit',
+    to: '/data-catalog',
+    type: 'internalLink'
+  }
+];
+
+const mainNavItems =
+  getNavItemsFromVedaConfig()?.mainNavItems ?? defaultMainNavItems;
+const subNavItems =
+  getNavItemsFromVedaConfig()?.subNavItems ?? defaultSubNavItems;
+const footerSettings =
+  getFooterItemsFromVedaConfig()?.footerSettings ?? defaultFooterSettings;
+const footerPrimaryContactItems =
+  getFooterItemsFromVedaConfig()?.footerPrimaryContactItems ??
+  defaultFooterPrimaryContactItems;
+const footerPrimaryNavItems =
+  getFooterItemsFromVedaConfig()?.footerPrimaryNavItems ??
+  defaultFooterPrimaryNavItems;
 
 export {
   mainNavItems,
-  subNavItems
-};
\ No newline at end of file
+  subNavItems,
+  footerSettings,
+  footerPrimaryContactItems,
+  footerPrimaryNavItems
+};
diff --git a/mock/veda.config.js b/mock/veda.config.js
index 97fde679c..ac951c20b 100644
--- a/mock/veda.config.js
+++ b/mock/veda.config.js
@@ -32,6 +32,49 @@ let mainNavItems = [
     type: 'internalLink'
   }
 ];
+let footerPrimaryNavItems = [
+  {
+    title: 'Data Catalog',
+    to: '/data-catalog',
+    type: 'internalLink'
+  },
+  {
+    title: 'Data Catalog 2',
+    to: '/data-catalog',
+    type: 'internalLink'
+  },
+  {
+    title: 'Data Catalog3',
+    to: '/data-catalog',
+    type: 'internalLink'
+  }
+];
+let footerPrimaryContactItems = [
+  {
+    title: 'News and Events',
+    to: '/data-catalog',
+    type: 'internalLink'
+  },
+  {
+    title: 'About',
+    to: '/data-catalog',
+    type: 'internalLink'
+  },
+  {
+    title: 'Contact Us',
+    to: '/data-catalog',
+    type: 'internalLink'
+  }
+];
+
+let footerSettings = {
+  secondarySection: {
+    title: 'email test',
+    to: '/data-catalog',
+    type: 'Email'
+  },
+  returnToTop: true
+};
 
 if (!!config.HUB_URL && !!config.HUB_NAME)
   mainNavItems = [
@@ -91,6 +134,11 @@ module.exports = {
     mainNavItems,
     subNavItems
   },
+  footerItems: {
+    footerSettings,
+    footerPrimaryContactItems,
+    footerPrimaryNavItems
+  },
   cookieConsentForm: {
     title: 'Cookie Consent',
     copy: 'We use cookies to enhance your browsing experience and to help us understand how our website is used. These cookies allow us to collect data on site usage and improve our services based on your interactions. To learn more about it, see our [Privacy Policy](https://www.nasa.gov/privacy/#cookies)',
diff --git a/parcel-resolver-veda/index.d.ts b/parcel-resolver-veda/index.d.ts
index eee428ff4..3d4ad89de 100644
--- a/parcel-resolver-veda/index.d.ts
+++ b/parcel-resolver-veda/index.d.ts
@@ -360,6 +360,20 @@ declare module 'veda' {
       }
     | undefined;
 
+  export const getFooterItemsFromVedaConfig: () =>
+    | {
+        footerSettings:
+          | (NavLinkItem | ModalNavLink | DropdownNavLink)[]
+          | undefined;
+        footerPrimaryContactItems:
+          | (NavLinkItem | ModalNavLink | DropdownNavLink)[]
+          | undefined;
+        footerPrimaryNavItems:
+          | (NavLinkItem | ModalNavLink | DropdownNavLink)[]
+          | undefined;
+      }
+    | undefined;
+
   /**
    * List of custom user defined pages.
    */
diff --git a/parcel-resolver-veda/index.js b/parcel-resolver-veda/index.js
index f00ca4028..d2d3e5d10 100644
--- a/parcel-resolver-veda/index.js
+++ b/parcel-resolver-veda/index.js
@@ -86,7 +86,6 @@ function generateMdxDataObject(data) {
 function getCookieConsentForm(result) {
   if (!result.cookieConsentForm) return undefined;
   else {
-
     const parsedCopy = md.render(result.cookieConsentForm.copy);
     const trimmedCopy = parsedCopy.replace(/(\r\n|\n|\r)/gm, '');
     return JSON.stringify({
@@ -229,7 +228,9 @@ module.exports = new Resolver({
           booleans: ${JSON.stringify(withDefaultStrings(result.booleans))},
           banner: ${getBannerContent(result)},
           navItems: ${JSON.stringify(result.navItems)},
-          cookieConsentForm: ${getCookieConsentForm(result)}
+          cookieConsentForm: ${getCookieConsentForm(result)},
+          footerItems: ${JSON.stringify(result.footerItems)}
+
         };
 
         export const theme = ${JSON.stringify(result.theme) || null};
@@ -250,7 +251,7 @@ module.exports = new Resolver({
         export const getBannerFromVedaConfig = () => config.banner;
         export const getNavItemsFromVedaConfig = () => config.navItems;
         export const getCookieConsentFromVedaConfig = () => config.cookieConsentForm;
-
+        export const getFooterItemsFromVedaConfig = () => config.footerItems
 
         export const datasets = ${generateMdxDataObject(datasetsImportData)};
         export const stories = ${generateMdxDataObject(storiesImportData)};

From a5b4502171d1cdfe1fea518707cc4b0e68f3c223 Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Mon, 9 Dec 2024 20:27:54 -0500
Subject: [PATCH 11/35] correcting styles

---
 .../components/common/page-footer/index.tsx     |  2 +-
 .../components/common/page-footer/styles.scss   | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 9827e0347..b6f7f9679 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -87,7 +87,7 @@ export default function PageFooter({
                 </span>
               </a>
             </div>
-            <div className='grid-col-4 footer-text grid-gap-6'>
+            <div className='grid-col-4 footer-text grid-gap-6 flex-justify-end'>
               <span>NASA Official: </span>
               <a
                 key={secondarySection.type}
diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index a60278b96..081445a8c 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -48,18 +48,25 @@
   padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
   background-color: themeVars.$veda-uswds-color-base-lightest;
 }
-#footer_secondary_container {
-  padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
-}
 
 .usa-footer__secondary-section {
   background-color: themeVars.$veda-uswds-color-base-darkest;
+  padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
+  & > .grid-container {
+    max-width: 100%;
+    padding: 0;
+    //NEED to determine how to remove 64rem max-width on grid-container
+  }
 }
 .usa-footer__primary-section {
   background-color: themeVars.$veda-uswds-color-base-lightest;
 }
 
-#mail_icon{
-  top:50%;
+#mail_icon {
+  top: 50%;
   transform: translateY(-50%);
 }
+
+.usa-footer__address > .grid-row {
+  justify-content: flex-end;
+}

From e6298823500c9dfc181758c53db7978a9e829c1f Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Mon, 9 Dec 2024 20:54:00 -0500
Subject: [PATCH 12/35] correct ts and lint errors

---
 app/scripts/components/common/layout-root/index.tsx | 2 +-
 app/scripts/components/common/page-footer/index.tsx | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 50c32547d..04c7bbe8c 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -113,7 +113,7 @@ function LayoutRoot(props: { children?: ReactNode }) {
           primarySection={{
             footerPrimaryContactItems,
             footerPrimaryNavItems
-          }}
+          }} // @ts-expect-error: NEED TO DELETE
           hideFooter={hideFooter}
         />
       ) : (
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index b6f7f9679..62f60f5b5 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentType } from 'react';
+import React from 'react';
 import { Icon } from '@trussworks/react-uswds';
 import NasaLogoColor from '../../nasa-logo-color.js';
 import {
@@ -19,7 +19,7 @@ export default function PageFooter({
   primarySection,
   hidefooter
 }: PageFooterProps) {
-  console.log(settings, primarySection, hidefooter);
+  // console.log(settings, primarySection, hidefooter);
   const returnToTopButton = () => {
     return (
       <div
@@ -34,13 +34,14 @@ export default function PageFooter({
   };
 
   const { returnToTop, secondarySection } = settings;
+  /* eslint-disable */
   const { footerPrimaryContactItems, footerPrimaryNavItems } = primarySection;
   return (
     <>
       <USWDSFooter
         size='slim'
         returnToTop={returnToTop && returnToTopButton()}
-        // className={hidefooter && 'display-none'}
+        className={hidefooter && 'display-none'}
         primary={
           <div
             id='footer_primary_container'

From a7a91ec8ebf50eb6dff5cd94547e987e6384a5bd Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Mon, 9 Dec 2024 21:04:40 -0500
Subject: [PATCH 13/35] correctin merge conflict issues.

---
 .../common/page-header/default-config.ts      |  11 +-
 parcel-resolver-veda/index.d.ts               |  18 +-
 yarn.lock                                     | 733 +++++++-----------
 3 files changed, 298 insertions(+), 464 deletions(-)

diff --git a/app/scripts/components/common/page-header/default-config.ts b/app/scripts/components/common/page-header/default-config.ts
index 3f7c4a41e..4f18083ab 100644
--- a/app/scripts/components/common/page-header/default-config.ts
+++ b/app/scripts/components/common/page-header/default-config.ts
@@ -1,4 +1,3 @@
-
 import {
   getString,
   getNavItemsFromVedaConfig,
@@ -7,10 +6,9 @@ import {
 import {
   InternalNavLink,
   ExternalNavLink,
-  ModalNavLink,
+  ActionNavItem,
   DropdownNavLink,
   NavItemType
-
 } from '$components/common/page-header/types';
 
 import {
@@ -24,7 +22,6 @@ let defaultMainNavItems: (
   | ExternalNavLink
   | InternalNavLink
   | DropdownNavLink
-
   | ActionNavItem
 )[] = [
   {
@@ -35,14 +32,12 @@ let defaultMainNavItems: (
     type: NavItemType.INTERNAL_LINK
   },
   {
-
     id: 'exploration',
     title: 'Exploration',
     to: EXPLORATION_PATH,
     type: NavItemType.INTERNAL_LINK
   },
   {
-
     id: 'stories',
     title: getString('stories').other,
     to: STORIES_PATH,
@@ -64,7 +59,6 @@ let defaultSubNavItems: (
   | ExternalNavLink
   | InternalNavLink
   | DropdownNavLink
-
   | ActionNavItem
 )[] = [
   {
@@ -75,8 +69,6 @@ let defaultSubNavItems: (
   }
 ];
 
-
-
 const defaultFooterSettings = {
   secondarySection: {
     title: 'email test',
@@ -154,4 +146,3 @@ export {
   footerPrimaryContactItems,
   footerPrimaryNavItems
 };
-
diff --git a/parcel-resolver-veda/index.d.ts b/parcel-resolver-veda/index.d.ts
index 7966742e1..d048107e5 100644
--- a/parcel-resolver-veda/index.d.ts
+++ b/parcel-resolver-veda/index.d.ts
@@ -349,26 +349,18 @@ declare module 'veda' {
 
   export const getNavItemsFromVedaConfig: () =>
     | {
-        mainNavItems:
-          | (NavLinkItem | DropdownNavLink)[]
-          | undefined;
-        subNavItems:
-          | (NavLinkItem | DropdownNavLink)[]
-          | undefined;
+        mainNavItems: (NavLinkItem | DropdownNavLink)[] | undefined;
+        subNavItems: (NavLinkItem | DropdownNavLink)[] | undefined;
       }
     | undefined;
 
   export const getFooterItemsFromVedaConfig: () =>
     | {
-        footerSettings:
-          | (NavLinkItem | ModalNavLink | DropdownNavLink)[]
-          | undefined;
+        footerSettings: (NavLinkItem | DropdownNavLink)[] | undefined;
         footerPrimaryContactItems:
-          | (NavLinkItem | ModalNavLink | DropdownNavLink)[]
-          | undefined;
-        footerPrimaryNavItems:
-          | (NavLinkItem | ModalNavLink | DropdownNavLink)[]
+          | (NavLinkItem | DropdownNavLink)[]
           | undefined;
+        footerPrimaryNavItems: (NavLinkItem | DropdownNavLink)[] | undefined;
       }
     | undefined;
 
diff --git a/yarn.lock b/yarn.lock
index 0f1903eaa..ac153271a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -74,7 +74,7 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.17.9":
+"@babel/core@^7.12.3", "@babel/core@^7.16.0":
   version "7.18.6"
   resolved "http://verdaccio.ds.io:4873/@babel%2fcore/-/core-7.18.6.tgz#54a107a3c298aee3fe5e1947a6464b9b6faca03d"
   integrity sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==
@@ -416,7 +416,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.18.6", "@babel/parser@^7.18.8", "@babel/parser@^7.8.3":
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.18.6", "@babel/parser@^7.18.8":
   version "7.18.8"
   resolved "http://verdaccio.ds.io:4873/@babel%2fparser/-/parser-7.18.8.tgz#822146080ac9c62dac0823bb3489622e0bc1cbdf"
   integrity sha512-RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA==
@@ -1171,7 +1171,7 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.8", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2", "@babel/traverse@^7.8.3":
+"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.8", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2":
   version "7.18.8"
   resolved "http://verdaccio.ds.io:4873/@babel%2ftraverse/-/traverse-7.18.8.tgz#f095e62ab46abf1da35e5a2011f43aee72d8d5b0"
   integrity sha512-UNg/AcSySJYR/+mIcJQDCv00T+AqRO7j/ZEJLzpaYtgM48rMg5MnkJgyNqkzo88+p4tfRvZJCEiwwfG6h4jkRg==
@@ -1396,6 +1396,26 @@
     "@types/semver" "^7.5.5"
     semver "^7.5.2"
 
+"@csstools/css-parser-algorithms@^3.0.4":
+  version "3.0.4"
+  resolved "http://verdaccio.ds.io:4873/@csstools%2fcss-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
+  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
+
+"@csstools/css-tokenizer@^3.0.3":
+  version "3.0.3"
+  resolved "http://verdaccio.ds.io:4873/@csstools%2fcss-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
+  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
+
+"@csstools/media-query-list-parser@^4.0.2":
+  version "4.0.2"
+  resolved "http://verdaccio.ds.io:4873/@csstools%2fmedia-query-list-parser/-/media-query-list-parser-4.0.2.tgz#e80e17eba1693fceafb8d6f2cfc68c0e7a9ab78a"
+  integrity sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==
+
+"@csstools/selector-specificity@^5.0.0":
+  version "5.0.0"
+  resolved "http://verdaccio.ds.io:4873/@csstools%2fselector-specificity/-/selector-specificity-5.0.0.tgz#037817b574262134cabd68fc4ec1a454f168407b"
+  integrity sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==
+
 "@devseed-ui/accordion@4.1.0":
   version "4.1.0"
   resolved "http://verdaccio.ds.io:4873/@devseed-ui%2faccordion/-/accordion-4.1.0.tgz#622483e69e553a4f1e8d4a8c44f61ad4cfa1395b"
@@ -1503,6 +1523,11 @@
   dependencies:
     "@devseed-ui/theme-provider" "^4.1.0"
 
+"@dual-bundle/import-meta-resolve@^4.1.0":
+  version "4.1.0"
+  resolved "http://verdaccio.ds.io:4873/@dual-bundle%2fimport-meta-resolve/-/import-meta-resolve-4.1.0.tgz#519c1549b0e147759e7825701ecffd25e5819f7b"
+  integrity sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==
+
 "@emotion/babel-plugin@^11.11.0":
   version "11.11.0"
   resolved "http://verdaccio.ds.io:4873/@emotion%2fbabel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c"
@@ -3833,21 +3858,6 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@stylelint/postcss-css-in-js@^0.37.2":
-  version "0.37.3"
-  resolved "http://verdaccio.ds.io:4873/@stylelint%2fpostcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz#d149a385e07ae365b0107314c084cb6c11adbf49"
-  integrity sha512-scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg==
-  dependencies:
-    "@babel/core" "^7.17.9"
-
-"@stylelint/postcss-markdown@^0.36.2":
-  version "0.36.2"
-  resolved "http://verdaccio.ds.io:4873/@stylelint%2fpostcss-markdown/-/postcss-markdown-0.36.2.tgz#0a540c4692f8dcdfc13c8e352c17e7bfee2bb391"
-  integrity sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==
-  dependencies:
-    remark "^13.0.0"
-    unist-util-find-all-after "^3.0.2"
-
 "@swc/core-darwin-arm64@1.6.6":
   version "1.6.6"
   resolved "http://verdaccio.ds.io:4873/@swc%2fcore-darwin-arm64/-/core-darwin-arm64-1.6.6.tgz#9488d50394cb08713c4321a940b48599c1c5e153"
@@ -4021,6 +4031,11 @@
     "@testing-library/dom" "^8.0.0"
     "@types/react-dom" "<18.0.0"
 
+"@testing-library/user-event@^14.5.2":
+  version "14.5.2"
+  resolved "http://verdaccio.ds.io:4873/@testing-library%2fuser-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd"
+  integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==
+
 "@tippyjs/react@^4.2.6":
   version "4.2.6"
   resolved "http://verdaccio.ds.io:4873/@tippyjs%2freact/-/react-4.2.6.tgz#971677a599bf663f20bb1c60a62b9555b749cc71"
@@ -5358,19 +5373,6 @@ autoprefixer@^10.4.19:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-autoprefixer@^9.8.6:
-  version "9.8.8"
-  resolved "http://verdaccio.ds.io:4873/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a"
-  integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
-  dependencies:
-    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001109"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    picocolors "^0.2.1"
-    postcss "^7.0.32"
-    postcss-value-parser "^4.1.0"
-
 axios@^0.25.0:
   version "0.25.0"
   resolved "http://verdaccio.ds.io:4873/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
@@ -5692,7 +5694,7 @@ browser-process-hrtime@^1.0.0:
   resolved "http://verdaccio.ds.io:4873/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4.21.1, browserslist@^4.6.6:
+browserslist@^4.20.2, browserslist@^4.21.1, browserslist@^4.6.6:
   version "4.21.2"
   resolved "http://verdaccio.ds.io:4873/browserslist/-/browserslist-4.21.2.tgz#59a400757465535954946a400b841ed37e2b4ecf"
   integrity sha512-MonuOgAtUB46uP5CezYbRaYKBNt2LxP0yX+Pmj4LkcDFGkn9Cbpi83d9sCjwQDErXsIJSzY5oKGDbgOlF/LPAA==
@@ -5867,7 +5869,7 @@ camelize@^1.0.0:
   resolved "http://verdaccio.ds.io:4873/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
   integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
 
-caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001366:
+caniuse-lite@^1.0.30001366:
   version "1.0.30001441"
   resolved "http://verdaccio.ds.io:4873/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"
   integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==
@@ -5922,7 +5924,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"
   resolved "http://verdaccio.ds.io:4873/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -6165,13 +6167,6 @@ clone-buffer@^1.0.0:
   resolved "http://verdaccio.ds.io:4873/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
   integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
 
-clone-regexp@^2.1.0:
-  version "2.2.0"
-  resolved "http://verdaccio.ds.io:4873/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f"
-  integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==
-  dependencies:
-    is-regexp "^2.0.0"
-
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "http://verdaccio.ds.io:4873/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -6318,6 +6313,11 @@ color@^3.2.1:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
+colord@^2.9.3:
+  version "2.9.3"
+  resolved "http://verdaccio.ds.io:4873/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
+  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
+
 colorette@^2.0.20:
   version "2.0.20"
   resolved "http://verdaccio.ds.io:4873/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
@@ -6585,7 +6585,7 @@ core-util-is@~1.0.0:
   resolved "http://verdaccio.ds.io:4873/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cosmiconfig@9.0.0:
+cosmiconfig@9.0.0, cosmiconfig@^9.0.0:
   version "9.0.0"
   resolved "http://verdaccio.ds.io:4873/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d"
   integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==
@@ -6637,6 +6637,11 @@ css-color-keywords@^1.0.0:
   resolved "http://verdaccio.ds.io:4873/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
   integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=
 
+css-functions-list@^3.2.3:
+  version "3.2.3"
+  resolved "http://verdaccio.ds.io:4873/css-functions-list/-/css-functions-list-3.2.3.tgz#95652b0c24f0f59b291a9fc386041a19d4f40dbe"
+  integrity sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==
+
 css-select@^4.1.3:
   version "4.3.0"
   resolved "http://verdaccio.ds.io:4873/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
@@ -6676,6 +6681,14 @@ css-tree@^1.1.2, css-tree@^1.1.3:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
+css-tree@^3.0.1:
+  version "3.1.0"
+  resolved "http://verdaccio.ds.io:4873/css-tree/-/css-tree-3.1.0.tgz#7aabc035f4e66b5c86f54570d55e05b1346eb0fd"
+  integrity sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==
+  dependencies:
+    mdn-data "2.12.2"
+    source-map-js "^1.0.1"
+
 css-tree@~2.2.0:
   version "2.2.1"
   resolved "http://verdaccio.ds.io:4873/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
@@ -7125,7 +7138,7 @@ debug@3.X, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "http://verdaccio.ds.io:4873/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -7139,6 +7152,13 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
+debug@^4.3.7:
+  version "4.4.0"
+  resolved "http://verdaccio.ds.io:4873/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+  dependencies:
+    ms "^2.1.3"
+
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "http://verdaccio.ds.io:4873/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -7421,14 +7441,6 @@ dom-helpers@^5.0.1:
     "@babel/runtime" "^7.8.7"
     csstype "^3.0.2"
 
-dom-serializer@0:
-  version "0.2.2"
-  resolved "http://verdaccio.ds.io:4873/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
-  dependencies:
-    domelementtype "^2.0.1"
-    entities "^2.0.0"
-
 dom-serializer@^1.0.1:
   version "1.4.1"
   resolved "http://verdaccio.ds.io:4873/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
@@ -7447,11 +7459,6 @@ dom-serializer@^2.0.0:
     domhandler "^5.0.2"
     entities "^4.2.0"
 
-domelementtype@1, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "http://verdaccio.ds.io:4873/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
 domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   version "2.3.0"
   resolved "http://verdaccio.ds.io:4873/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
@@ -7464,13 +7471,6 @@ domexception@^4.0.0:
   dependencies:
     webidl-conversions "^7.0.0"
 
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "http://verdaccio.ds.io:4873/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
-  dependencies:
-    domelementtype "1"
-
 domhandler@^4.2.0, domhandler@^4.2.2, domhandler@^4.3.1:
   version "4.3.1"
   resolved "http://verdaccio.ds.io:4873/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
@@ -7485,14 +7485,6 @@ domhandler@^5.0.2, domhandler@^5.0.3:
   dependencies:
     domelementtype "^2.3.0"
 
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "http://verdaccio.ds.io:4873/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 domutils@^2.8.0:
   version "2.8.0"
   resolved "http://verdaccio.ds.io:4873/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
@@ -7620,11 +7612,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-entities@^1.1.1:
-  version "1.1.2"
-  resolved "http://verdaccio.ds.io:4873/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
 entities@^2.0.0:
   version "2.2.0"
   resolved "http://verdaccio.ds.io:4873/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -8152,13 +8139,6 @@ execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execall@^2.0.0:
-  version "2.0.0"
-  resolved "http://verdaccio.ds.io:4873/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
-  integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==
-  dependencies:
-    clone-regexp "^2.1.0"
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "http://verdaccio.ds.io:4873/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -8270,7 +8250,7 @@ fast-equals@^2.0.0:
   resolved "http://verdaccio.ds.io:4873/fast-equals/-/fast-equals-2.0.4.tgz#3add9410585e2d7364c2deeb6a707beadb24b927"
   integrity sha512-caj/ZmjHljPrZtbzJ3kfH5ia/k4mTJe/qSiXAGzxZWRZgsgDV0cvNaQULqUX8t0/JVlzzEdYOwCN5DmzTxoD4w==
 
-fast-glob@^3.2.5, fast-glob@^3.2.9:
+fast-glob@^3.2.9:
   version "3.2.11"
   resolved "http://verdaccio.ds.io:4873/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
   integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
@@ -8307,10 +8287,10 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "http://verdaccio.ds.io:4873/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fastest-levenshtein@^1.0.12:
-  version "1.0.12"
-  resolved "http://verdaccio.ds.io:4873/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
-  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
+fastest-levenshtein@^1.0.16:
+  version "1.0.16"
+  resolved "http://verdaccio.ds.io:4873/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
 fastq@^1.6.0:
   version "1.13.0"
@@ -8338,6 +8318,13 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+file-entry-cache@^9.1.0:
+  version "9.1.0"
+  resolved "http://verdaccio.ds.io:4873/file-entry-cache/-/file-entry-cache-9.1.0.tgz#2e66ad98ce93f49aed1b178c57b0b5741591e075"
+  integrity sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==
+  dependencies:
+    flat-cache "^5.0.0"
+
 file-saver@^2.0.5:
   version "2.0.5"
   resolved "http://verdaccio.ds.io:4873/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
@@ -8442,11 +8429,24 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flat-cache@^5.0.0:
+  version "5.0.0"
+  resolved "http://verdaccio.ds.io:4873/flat-cache/-/flat-cache-5.0.0.tgz#26c4da7b0f288b408bb2b506b2cb66c240ddf062"
+  integrity sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==
+  dependencies:
+    flatted "^3.3.1"
+    keyv "^4.5.4"
+
 flatted@^3.1.0:
   version "3.2.6"
   resolved "http://verdaccio.ds.io:4873/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
   integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
 
+flatted@^3.3.1:
+  version "3.3.2"
+  resolved "http://verdaccio.ds.io:4873/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27"
+  integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==
+
 flush-write-stream@^1.0.2:
   version "1.1.1"
   resolved "http://verdaccio.ds.io:4873/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -8685,11 +8685,6 @@ get-port@^4.2.0:
   resolved "http://verdaccio.ds.io:4873/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
   integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
 
-get-stdin@^8.0.0:
-  version "8.0.0"
-  resolved "http://verdaccio.ds.io:4873/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
-  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "http://verdaccio.ds.io:4873/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -8917,7 +8912,7 @@ globby@14.0.2:
     slash "^5.1.0"
     unicorn-magic "^0.1.0"
 
-globby@^11.0.1, globby@^11.0.3, globby@^11.1.0:
+globby@^11.0.1, globby@^11.1.0:
   version "11.1.0"
   resolved "http://verdaccio.ds.io:4873/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -8941,13 +8936,6 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
-gonzales-pe@^4.3.0:
-  version "4.3.0"
-  resolved "http://verdaccio.ds.io:4873/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
-  integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
-  dependencies:
-    minimist "^1.2.5"
-
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "http://verdaccio.ds.io:4873/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
@@ -9332,13 +9320,6 @@ hosted-git-info@^2.1.4:
   resolved "http://verdaccio.ds.io:4873/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-hosted-git-info@^4.0.1:
-  version "4.1.0"
-  resolved "http://verdaccio.ds.io:4873/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
-  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
-  dependencies:
-    lru-cache "^6.0.0"
-
 hosted-git-info@^7.0.0:
   version "7.0.2"
   resolved "http://verdaccio.ds.io:4873/hosted-git-info/-/hosted-git-info-7.0.2.tgz#9b751acac097757667f30114607ef7b661ff4f17"
@@ -9358,10 +9339,10 @@ html-escaper@^2.0.0:
   resolved "http://verdaccio.ds.io:4873/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-tags@^3.1.0:
-  version "3.2.0"
-  resolved "http://verdaccio.ds.io:4873/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961"
-  integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
+html-tags@^3.3.1:
+  version "3.3.1"
+  resolved "http://verdaccio.ds.io:4873/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
+  integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
 html-void-elements@^1.0.0:
   version "1.0.5"
@@ -9377,18 +9358,6 @@ htmlnano@^2.0.0:
     posthtml "^0.16.5"
     timsort "^0.3.0"
 
-htmlparser2@^3.10.0:
-  version "3.10.1"
-  resolved "http://verdaccio.ds.io:4873/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
-  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
-  dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
-
 htmlparser2@^7.1.1:
   version "7.2.0"
   resolved "http://verdaccio.ds.io:4873/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5"
@@ -9491,7 +9460,7 @@ ieee754@^1.1.12, ieee754@^1.1.13, ieee754@^1.2.1:
   resolved "http://verdaccio.ds.io:4873/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.8, ignore@^5.2.0:
+ignore@^5.2.0:
   version "5.2.0"
   resolved "http://verdaccio.ds.io:4873/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -9501,6 +9470,11 @@ ignore@^5.2.4:
   resolved "http://verdaccio.ds.io:4873/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
+ignore@^6.0.2:
+  version "6.0.2"
+  resolved "http://verdaccio.ds.io:4873/ignore/-/ignore-6.0.2.tgz#77cccb72a55796af1b6d2f9eb14fa326d24f4283"
+  integrity sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "http://verdaccio.ds.io:4873/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -9524,11 +9498,6 @@ import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-lazy@^4.0.0:
-  version "4.0.0"
-  resolved "http://verdaccio.ds.io:4873/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
-  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
-
 import-local@^3.0.2:
   version "3.1.0"
   resolved "http://verdaccio.ds.io:4873/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
@@ -9756,13 +9725,6 @@ is-core-module@^2.13.0:
   dependencies:
     hasown "^2.0.0"
 
-is-core-module@^2.5.0, is-core-module@^2.9.0:
-  version "2.9.0"
-  resolved "http://verdaccio.ds.io:4873/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
-  dependencies:
-    has "^1.0.3"
-
 is-core-module@^2.8.1:
   version "2.11.0"
   resolved "http://verdaccio.ds.io:4873/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
@@ -9770,6 +9732,13 @@ is-core-module@^2.8.1:
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.9.0:
+  version "2.9.0"
+  resolved "http://verdaccio.ds.io:4873/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
+  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "http://verdaccio.ds.io:4873/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -10040,11 +10009,6 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-regexp@^2.0.0:
-  version "2.1.0"
-  resolved "http://verdaccio.ds.io:4873/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
-  integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
-
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "http://verdaccio.ds.io:4873/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
@@ -10090,11 +10054,6 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0:
-  version "1.0.0"
-  resolved "http://verdaccio.ds.io:4873/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "http://verdaccio.ds.io:4873/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
@@ -10823,6 +10782,13 @@ keyv@^4.0.0:
     compress-brotli "^1.3.8"
     json-buffer "3.0.1"
 
+keyv@^4.5.4:
+  version "4.5.4"
+  resolved "http://verdaccio.ds.io:4873/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "http://verdaccio.ds.io:4873/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -10857,10 +10823,10 @@ kleur@^4.0.3:
   resolved "http://verdaccio.ds.io:4873/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
   integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
 
-known-css-properties@^0.21.0:
-  version "0.21.0"
-  resolved "http://verdaccio.ds.io:4873/known-css-properties/-/known-css-properties-0.21.0.tgz#15fbd0bbb83447f3ce09d8af247ed47c68ede80d"
-  integrity sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==
+known-css-properties@^0.35.0:
+  version "0.35.0"
+  resolved "http://verdaccio.ds.io:4873/known-css-properties/-/known-css-properties-0.35.0.tgz#f6f8e40ab4e5700fa32f5b2ef5218a56bc853bd6"
+  integrity sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==
 
 ky@^1.2.0:
   version "1.7.2"
@@ -11223,11 +11189,6 @@ log-update@^5.0.1:
     strip-ansi "^7.0.1"
     wrap-ansi "^8.0.1"
 
-longest-streak@^2.0.0:
-  version "2.0.4"
-  resolved "http://verdaccio.ds.io:4873/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
-  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
-
 longest-streak@^3.0.0:
   version "3.0.1"
   resolved "http://verdaccio.ds.io:4873/longest-streak/-/longest-streak-3.0.1.tgz#c97315b7afa0e7d9525db9a5a2953651432bdc5d"
@@ -11458,17 +11419,6 @@ mdast-util-find-and-replace@^2.0.0:
     unist-util-is "^5.0.0"
     unist-util-visit-parents "^5.0.0"
 
-mdast-util-from-markdown@^0.8.0:
-  version "0.8.5"
-  resolved "http://verdaccio.ds.io:4873/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
-  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-string "^2.0.0"
-    micromark "~2.11.0"
-    parse-entities "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-
 mdast-util-from-markdown@^1.0.0:
   version "1.2.0"
   resolved "http://verdaccio.ds.io:4873/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz#84df2924ccc6c995dec1e2368b2b208ad0a76268"
@@ -11622,18 +11572,6 @@ mdast-util-to-hast@^12.1.0:
     unist-util-position "^4.0.0"
     unist-util-visit "^4.0.0"
 
-mdast-util-to-markdown@^0.6.0:
-  version "0.6.5"
-  resolved "http://verdaccio.ds.io:4873/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
-  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    longest-streak "^2.0.0"
-    mdast-util-to-string "^2.0.0"
-    parse-entities "^2.0.0"
-    repeat-string "^1.0.0"
-    zwitch "^1.0.0"
-
 mdast-util-to-markdown@^1.0.0, mdast-util-to-markdown@^1.3.0:
   version "1.3.0"
   resolved "http://verdaccio.ds.io:4873/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz#38b6cdc8dc417de642a469c4fc2abdf8c931bd1e"
@@ -11647,11 +11585,6 @@ mdast-util-to-markdown@^1.0.0, mdast-util-to-markdown@^1.3.0:
     unist-util-visit "^4.0.0"
     zwitch "^2.0.0"
 
-mdast-util-to-string@^2.0.0:
-  version "2.0.0"
-  resolved "http://verdaccio.ds.io:4873/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
-  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
-
 mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0:
   version "3.1.0"
   resolved "http://verdaccio.ds.io:4873/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9"
@@ -11667,6 +11600,16 @@ mdn-data@2.0.28:
   resolved "http://verdaccio.ds.io:4873/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
   integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
 
+mdn-data@2.12.2:
+  version "2.12.2"
+  resolved "http://verdaccio.ds.io:4873/mdn-data/-/mdn-data-2.12.2.tgz#9ae6c41a9e65adf61318b32bff7b64fbfb13f8cf"
+  integrity sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==
+
+mdn-data@^2.12.2:
+  version "2.13.0"
+  resolved "http://verdaccio.ds.io:4873/mdn-data/-/mdn-data-2.13.0.tgz#10af1de5d0d5e4ceb4fe01f3086b34f1178473d9"
+  integrity sha512-OmD1FDyP706JqPqtLqgev/QCK0qudBdUuKKag6InQ/elEw3Cm2AhXYktcSggdc/vWniYqIsofkcteMEOioW5vQ==
+
 mdurl@^1.0.0:
   version "1.0.1"
   resolved "http://verdaccio.ds.io:4873/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -11699,7 +11642,7 @@ memoizee@0.4.X:
     next-tick "^1.1.0"
     timers-ext "^0.1.7"
 
-meow@^13.0.0:
+meow@^13.0.0, meow@^13.2.0:
   version "13.2.0"
   resolved "http://verdaccio.ds.io:4873/meow/-/meow-13.2.0.tgz#6b7d63f913f984063b3cc261b6e8800c4cd3474f"
   integrity sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==
@@ -11721,24 +11664,6 @@ meow@^6.1.1:
     type-fest "^0.13.1"
     yargs-parser "^18.1.3"
 
-meow@^9.0.0:
-  version "9.0.0"
-  resolved "http://verdaccio.ds.io:4873/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
-  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
-  dependencies:
-    "@types/minimist" "^1.2.0"
-    camelcase-keys "^6.2.2"
-    decamelize "^1.2.0"
-    decamelize-keys "^1.1.0"
-    hard-rejection "^2.1.0"
-    minimist-options "4.1.0"
-    normalize-package-data "^3.0.0"
-    read-pkg-up "^7.0.1"
-    redent "^3.0.0"
-    trim-newlines "^3.0.0"
-    type-fest "^0.18.0"
-    yargs-parser "^20.2.3"
-
 merge-class-names@^1.1.1:
   version "1.4.2"
   resolved "http://verdaccio.ds.io:4873/merge-class-names/-/merge-class-names-1.4.2.tgz#78d6d95ab259e7e647252a7988fd25a27d5a8835"
@@ -12124,15 +12049,7 @@ micromark@^3.0.0:
     micromark-util-types "^1.0.1"
     uvu "^0.5.0"
 
-micromark@~2.11.0:
-  version "2.11.4"
-  resolved "http://verdaccio.ds.io:4873/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
-  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
-  dependencies:
-    debug "^4.0.0"
-    parse-entities "^2.0.0"
-
-micromatch@4.0.5, micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@4.0.5, micromatch@^4.0.4:
   version "4.0.5"
   resolved "http://verdaccio.ds.io:4873/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -12167,6 +12084,14 @@ micromatch@^4.0.5:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
+micromatch@^4.0.8:
+  version "4.0.8"
+  resolved "http://verdaccio.ds.io:4873/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
 mime-db@1.52.0:
   version "1.52.0"
   resolved "http://verdaccio.ds.io:4873/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -12221,7 +12146,7 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist-options@4.1.0, minimist-options@^4.0.2:
+minimist-options@^4.0.2:
   version "4.1.0"
   resolved "http://verdaccio.ds.io:4873/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
   integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
@@ -12268,7 +12193,7 @@ ms@2.1.2:
   resolved "http://verdaccio.ds.io:4873/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
+ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "http://verdaccio.ds.io:4873/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -12463,16 +12388,6 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^3.0.0:
-  version "3.0.3"
-  resolved "http://verdaccio.ds.io:4873/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
-  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
-  dependencies:
-    hosted-git-info "^4.0.1"
-    is-core-module "^2.5.0"
-    semver "^7.3.4"
-    validate-npm-package-license "^3.0.1"
-
 normalize-package-data@^6.0.0:
   version "6.0.2"
   resolved "http://verdaccio.ds.io:4873/normalize-package-data/-/normalize-package-data-6.0.2.tgz#a7bc22167fe24025412bcff0a9651eb768b03506"
@@ -12499,11 +12414,6 @@ normalize-range@^0.1.2:
   resolved "http://verdaccio.ds.io:4873/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-selector@^0.2.0:
-  version "0.2.0"
-  resolved "http://verdaccio.ds.io:4873/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
-  integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
-
 normalize-url@^6.0.1:
   version "6.1.0"
   resolved "http://verdaccio.ds.io:4873/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
@@ -12542,11 +12452,6 @@ nullthrows@^1.1.1:
   resolved "http://verdaccio.ds.io:4873/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
   integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
 
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "http://verdaccio.ds.io:4873/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "http://verdaccio.ds.io:4873/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -13169,6 +13074,11 @@ picocolors@^1.0.1:
   resolved "http://verdaccio.ds.io:4873/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
   integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
+picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "http://verdaccio.ds.io:4873/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1:
   version "2.3.1"
   resolved "http://verdaccio.ds.io:4873/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -13273,13 +13183,6 @@ postcss-csso@6.0.1:
   dependencies:
     csso "^5.0.5"
 
-postcss-html@^0.36.0:
-  version "0.36.0"
-  resolved "http://verdaccio.ds.io:4873/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204"
-  integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==
-  dependencies:
-    htmlparser2 "^3.10.0"
-
 postcss-import@^16.1.0:
   version "16.1.0"
   resolved "http://verdaccio.ds.io:4873/postcss-import/-/postcss-import-16.1.0.tgz#258732175518129667fe1e2e2a05b19b5654b96a"
@@ -13289,13 +13192,6 @@ postcss-import@^16.1.0:
     read-cache "^1.0.0"
     resolve "^1.1.7"
 
-postcss-less@^3.1.4:
-  version "3.1.4"
-  resolved "http://verdaccio.ds.io:4873/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
-  integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
-  dependencies:
-    postcss "^7.0.14"
-
 postcss-load-config@^3.0.0:
   version "3.1.4"
   resolved "http://verdaccio.ds.io:4873/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
@@ -13316,44 +13212,27 @@ postcss-media-query-parser@^0.2.3:
   dependencies:
     postcss-selector-parser "^6.0.6"
 
-postcss-resolve-nested-selector@^0.1.1:
-  version "0.1.1"
-  resolved "http://verdaccio.ds.io:4873/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
-  integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
-
-postcss-safe-parser@^4.0.2:
-  version "4.0.2"
-  resolved "http://verdaccio.ds.io:4873/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
-  integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
-  dependencies:
-    postcss "^7.0.26"
+postcss-resolve-nested-selector@^0.1.6:
+  version "0.1.6"
+  resolved "http://verdaccio.ds.io:4873/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz#3d84dec809f34de020372c41b039956966896686"
+  integrity sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==
 
 postcss-safe-parser@^7.0.0:
   version "7.0.0"
   resolved "http://verdaccio.ds.io:4873/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz#6273d4e5149e286db5a45bc6cf6eafcad464014a"
   integrity sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==
 
-postcss-sass@^0.4.4:
-  version "0.4.4"
-  resolved "http://verdaccio.ds.io:4873/postcss-sass/-/postcss-sass-0.4.4.tgz#91f0f3447b45ce373227a98b61f8d8f0785285a3"
-  integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==
-  dependencies:
-    gonzales-pe "^4.3.0"
-    postcss "^7.0.21"
-
-postcss-scss@^2.1.1:
-  version "2.1.1"
-  resolved "http://verdaccio.ds.io:4873/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
-  integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
-  dependencies:
-    postcss "^7.0.6"
+postcss-safe-parser@^7.0.1:
+  version "7.0.1"
+  resolved "http://verdaccio.ds.io:4873/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz#36e4f7e608111a0ca940fd9712ce034718c40ec0"
+  integrity sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==
 
 postcss-scss@^4.0.9:
   version "4.0.9"
   resolved "http://verdaccio.ds.io:4873/postcss-scss/-/postcss-scss-4.0.9.tgz#a03c773cd4c9623cb04ce142a52afcec74806685"
   integrity sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==
 
-postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6:
+postcss-selector-parser@^6.0.6:
   version "6.0.10"
   resolved "http://verdaccio.ds.io:4873/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -13361,17 +13240,27 @@ postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-syntax@^0.36.2:
-  version "0.36.2"
-  resolved "http://verdaccio.ds.io:4873/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
-  integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
+postcss-selector-parser@^7.0.0:
+  version "7.0.0"
+  resolved "http://verdaccio.ds.io:4873/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz#41bd8b56f177c093ca49435f65731befe25d6b9c"
+  integrity sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-styled-syntax@^0.7.0:
+  version "0.7.0"
+  resolved "http://verdaccio.ds.io:4873/postcss-styled-syntax/-/postcss-styled-syntax-0.7.0.tgz#7ae2f5e9af36af3e81fc96f0e92c98d27b21be9d"
+  integrity sha512-OeStzPkHJ1/WDGRKm/JuVK8UdJbjt3U7AFC+zUc9omJ79SaXSxWoy+PXxJz7t8vOO8HcUgCLndNEQfLvZ74TuQ==
+  dependencies:
+    typescript "^5.6.3"
 
 postcss-value-parser@^3.3.0:
   version "3.3.1"
   resolved "http://verdaccio.ds.io:4873/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.2.0:
   version "4.2.0"
   resolved "http://verdaccio.ds.io:4873/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
@@ -13385,7 +13274,7 @@ postcss@8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6:
+postcss@^7.0.16:
   version "7.0.39"
   resolved "http://verdaccio.ds.io:4873/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
   integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
@@ -13411,6 +13300,15 @@ postcss@^8.4.39:
     picocolors "^1.0.1"
     source-map-js "^1.2.0"
 
+postcss@^8.4.49:
+  version "8.4.49"
+  resolved "http://verdaccio.ds.io:4873/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 posthtml-expressions@^1.9.0:
   version "1.9.0"
   resolved "http://verdaccio.ds.io:4873/posthtml-expressions/-/posthtml-expressions-1.9.0.tgz#0b00e0e557392f66eb6b88d89cd090789eadd78c"
@@ -14062,7 +13960,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.1.1, readable-stream@^3.5.0:
+readable-stream@^3.5.0:
   version "3.6.0"
   resolved "http://verdaccio.ds.io:4873/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -14331,13 +14229,6 @@ remark-parse@^10.0.0:
     mdast-util-from-markdown "^1.0.0"
     unified "^10.0.0"
 
-remark-parse@^9.0.0:
-  version "9.0.0"
-  resolved "http://verdaccio.ds.io:4873/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
-  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
-  dependencies:
-    mdast-util-from-markdown "^0.8.0"
-
 remark-rehype@^10.0.0:
   version "10.1.0"
   resolved "http://verdaccio.ds.io:4873/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279"
@@ -14355,22 +14246,6 @@ remark-squeeze-paragraphs@4.0.0:
   dependencies:
     mdast-squeeze-paragraphs "^4.0.0"
 
-remark-stringify@^9.0.0:
-  version "9.0.1"
-  resolved "http://verdaccio.ds.io:4873/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894"
-  integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==
-  dependencies:
-    mdast-util-to-markdown "^0.6.0"
-
-remark@^13.0.0:
-  version "13.0.0"
-  resolved "http://verdaccio.ds.io:4873/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425"
-  integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==
-  dependencies:
-    remark-parse "^9.0.0"
-    remark-stringify "^9.0.0"
-    unified "^9.1.0"
-
 remove-accents@0.4.2:
   version "0.4.2"
   resolved "http://verdaccio.ds.io:4873/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
@@ -14403,7 +14278,7 @@ repeat-element@^1.1.2:
   resolved "http://verdaccio.ds.io:4873/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
   integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
-repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "http://verdaccio.ds.io:4873/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -14797,7 +14672,7 @@ semver@7.6.3, semver@^7.6.0, semver@^7.6.3:
   resolved "http://verdaccio.ds.io:4873/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
-semver@7.x, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+semver@7.x, semver@^7.3.5, semver@^7.3.7:
   version "7.3.7"
   resolved "http://verdaccio.ds.io:4873/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
@@ -14885,7 +14760,7 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "http://verdaccio.ds.io:4873/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-signal-exit@^4.1.0:
+signal-exit@^4.0.1, signal-exit@^4.1.0:
   version "4.1.0"
   resolved "http://verdaccio.ds.io:4873/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
@@ -15013,6 +14888,11 @@ source-map-js@^1.0.2:
   resolved "http://verdaccio.ds.io:4873/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "http://verdaccio.ds.io:4873/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "http://verdaccio.ds.io:4873/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -15096,11 +14976,6 @@ spdx-license-ids@^3.0.0:
   resolved "http://verdaccio.ds.io:4873/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
   integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
 
-specificity@^0.4.1:
-  version "0.4.1"
-  resolved "http://verdaccio.ds.io:4873/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
-  integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
-
 splaytree@^3.1.0:
   version "3.1.1"
   resolved "http://verdaccio.ds.io:4873/splaytree/-/splaytree-3.1.1.tgz#e1bc8e68e64ef5a9d5f09d36e6d9f3621795a438"
@@ -15210,7 +15085,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "http://verdaccio.ds.io:4873/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -15371,11 +15246,6 @@ style-mod@^4.0.0:
   resolved "http://3.220.121.64:4873/style-mod/-/style-mod-4.0.3.tgz#136c4abc905f82a866a18b39df4dc08ec762b1ad"
   integrity sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw==
 
-style-search@^0.1.0:
-  version "0.1.0"
-  resolved "http://verdaccio.ds.io:4873/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
-  integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
-
 style-to-object@0.3.0, style-to-object@^0.3.0:
   version "0.3.0"
   resolved "http://verdaccio.ds.io:4873/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
@@ -15399,79 +15269,92 @@ styled-components@^5.3.3:
     shallowequal "^1.1.0"
     supports-color "^5.5.0"
 
-stylelint-config-recommended@^3.0.0:
-  version "3.0.0"
-  resolved "http://verdaccio.ds.io:4873/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
-  integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
+stylelint-config-recommended-scss@^14.0.0:
+  version "14.1.0"
+  resolved "http://verdaccio.ds.io:4873/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.1.0.tgz#1a5855655cddcb5f77c10f38c76567adf2bb9aa3"
+  integrity sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==
+  dependencies:
+    postcss-scss "^4.0.9"
+    stylelint-config-recommended "^14.0.1"
+    stylelint-scss "^6.4.0"
 
-stylelint-config-styled-components@^0.1.1:
-  version "0.1.1"
-  resolved "http://verdaccio.ds.io:4873/stylelint-config-styled-components/-/stylelint-config-styled-components-0.1.1.tgz#b408388d7c687833ab4be4c4e6522d97d2827ede"
-  integrity sha512-z5Xz/9GmvxO6e/DLzBMwkB85zHxEEjN6K7Cj80Bi+o/9vR9eS3GX3E9VuMnX9WLFYulqbqLtTapGGY28JBiy9Q==
+stylelint-config-recommended@^14.0.1:
+  version "14.0.1"
+  resolved "http://verdaccio.ds.io:4873/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz#d25e86409aaf79ee6c6085c2c14b33c7e23c90c6"
+  integrity sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==
 
-stylelint-processor-styled-components@^1.10.0:
-  version "1.10.0"
-  resolved "http://verdaccio.ds.io:4873/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.10.0.tgz#8082fc68779476aac411d3afffac0bc833d77a29"
-  integrity sha512-g4HpN9rm0JD0LoHuIOcd/FIjTZCJ0ErQ+dC3VTxp+dSvnkV+MklKCCmCQEdz5K5WxF4vPuzfVgdbSDuPYGZhoA==
-  dependencies:
-    "@babel/parser" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    micromatch "^4.0.2"
-    postcss "^7.0.26"
-
-stylelint@^13.12:
-  version "13.13.1"
-  resolved "http://verdaccio.ds.io:4873/stylelint/-/stylelint-13.13.1.tgz#fca9c9f5de7990ab26a00f167b8978f083a18f3c"
-  integrity sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==
-  dependencies:
-    "@stylelint/postcss-css-in-js" "^0.37.2"
-    "@stylelint/postcss-markdown" "^0.36.2"
-    autoprefixer "^9.8.6"
+stylelint-config-standard-scss@^13.1.0:
+  version "13.1.0"
+  resolved "http://verdaccio.ds.io:4873/stylelint-config-standard-scss/-/stylelint-config-standard-scss-13.1.0.tgz#2be36ca13087325a42c1f26df8267808667cc886"
+  integrity sha512-Eo5w7/XvwGHWkeGLtdm2FZLOMYoZl1omP2/jgFCXyl2x5yNz7/8vv4Tj6slHvMSSUNTaGoam/GAZ0ZhukvalfA==
+  dependencies:
+    stylelint-config-recommended-scss "^14.0.0"
+    stylelint-config-standard "^36.0.0"
+
+stylelint-config-standard@^36.0.0:
+  version "36.0.1"
+  resolved "http://verdaccio.ds.io:4873/stylelint-config-standard/-/stylelint-config-standard-36.0.1.tgz#727cbb2a1ef3e210f5ce8329cde531129f156609"
+  integrity sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==
+  dependencies:
+    stylelint-config-recommended "^14.0.1"
+
+stylelint-scss@^6.4.0:
+  version "6.10.0"
+  resolved "http://verdaccio.ds.io:4873/stylelint-scss/-/stylelint-scss-6.10.0.tgz#ba5b807793e145421e9879dd15ae672af6820a45"
+  integrity sha512-y03if6Qw9xBMoVaf7tzp5BbnYhYvudIKzURkhSHzcHG0bW0fAYvQpTUVJOe7DyhHaxeThBil4ObEMvGbV7+M+w==
+  dependencies:
+    css-tree "^3.0.1"
+    is-plain-object "^5.0.0"
+    known-css-properties "^0.35.0"
+    mdn-data "^2.12.2"
+    postcss-media-query-parser "^0.2.3"
+    postcss-resolve-nested-selector "^0.1.6"
+    postcss-selector-parser "^7.0.0"
+    postcss-value-parser "^4.2.0"
+
+stylelint@^16.10.0:
+  version "16.11.0"
+  resolved "http://verdaccio.ds.io:4873/stylelint/-/stylelint-16.11.0.tgz#7eb653b007dc0b4366dc3aa7bfa94ced0c52f087"
+  integrity sha512-zrl4IrKmjJQ+h9FoMp69UMCq5SxeHk0URhxUBj4d3ISzo/DplOFBJZc7t7Dr6otB+1bfbbKNLOmCDpzKSlW+Nw==
+  dependencies:
+    "@csstools/css-parser-algorithms" "^3.0.4"
+    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/selector-specificity" "^5.0.0"
+    "@dual-bundle/import-meta-resolve" "^4.1.0"
     balanced-match "^2.0.0"
-    chalk "^4.1.1"
-    cosmiconfig "^7.0.0"
-    debug "^4.3.1"
-    execall "^2.0.0"
-    fast-glob "^3.2.5"
-    fastest-levenshtein "^1.0.12"
-    file-entry-cache "^6.0.1"
-    get-stdin "^8.0.0"
+    colord "^2.9.3"
+    cosmiconfig "^9.0.0"
+    css-functions-list "^3.2.3"
+    css-tree "^3.0.1"
+    debug "^4.3.7"
+    fast-glob "^3.3.2"
+    fastest-levenshtein "^1.0.16"
+    file-entry-cache "^9.1.0"
     global-modules "^2.0.0"
-    globby "^11.0.3"
+    globby "^11.1.0"
     globjoin "^0.1.4"
-    html-tags "^3.1.0"
-    ignore "^5.1.8"
-    import-lazy "^4.0.0"
+    html-tags "^3.3.1"
+    ignore "^6.0.2"
     imurmurhash "^0.1.4"
-    known-css-properties "^0.21.0"
-    lodash "^4.17.21"
-    log-symbols "^4.1.0"
+    is-plain-object "^5.0.0"
+    known-css-properties "^0.35.0"
     mathml-tag-names "^2.1.3"
-    meow "^9.0.0"
-    micromatch "^4.0.4"
-    normalize-selector "^0.2.0"
-    postcss "^7.0.35"
-    postcss-html "^0.36.0"
-    postcss-less "^3.1.4"
-    postcss-media-query-parser "^0.2.3"
-    postcss-resolve-nested-selector "^0.1.1"
-    postcss-safe-parser "^4.0.2"
-    postcss-sass "^0.4.4"
-    postcss-scss "^2.1.1"
-    postcss-selector-parser "^6.0.5"
-    postcss-syntax "^0.36.2"
-    postcss-value-parser "^4.1.0"
+    meow "^13.2.0"
+    micromatch "^4.0.8"
+    normalize-path "^3.0.0"
+    picocolors "^1.1.1"
+    postcss "^8.4.49"
+    postcss-resolve-nested-selector "^0.1.6"
+    postcss-safe-parser "^7.0.1"
+    postcss-selector-parser "^7.0.0"
+    postcss-value-parser "^4.2.0"
     resolve-from "^5.0.0"
-    slash "^3.0.0"
-    specificity "^0.4.1"
-    string-width "^4.2.2"
-    strip-ansi "^6.0.0"
-    style-search "^0.1.0"
-    sugarss "^2.0.0"
+    string-width "^4.2.3"
+    supports-hyperlinks "^3.1.0"
     svg-tags "^1.0.0"
-    table "^6.6.0"
-    v8-compile-cache "^2.3.0"
-    write-file-atomic "^3.0.3"
+    table "^6.8.2"
+    write-file-atomic "^5.0.1"
 
 stylis@4.2.0:
   version "4.2.0"
@@ -15483,13 +15366,6 @@ subtag@^0.5.0:
   resolved "http://verdaccio.ds.io:4873/subtag/-/subtag-0.5.0.tgz#1728a8df5257fb98ded4fb981b2ac7af10cf58ba"
   integrity sha512-CaIBcTSb/nyk4xiiSOtZYz1B+F12ZxW8NEp54CdT+84vmh/h4sUnHGC6+KQXUfED8u22PQjCYWfZny8d2ELXwg==
 
-sugarss@^2.0.0:
-  version "2.0.0"
-  resolved "http://verdaccio.ds.io:4873/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"
-  integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==
-  dependencies:
-    postcss "^7.0.2"
-
 suggestions@^1.6.0:
   version "1.7.1"
   resolved "http://verdaccio.ds.io:4873/suggestions/-/suggestions-1.7.1.tgz#2fefcbde8967353056d1d6eaed891b46d98a7e5c"
@@ -15534,6 +15410,14 @@ supports-hyperlinks@^2.0.0:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
 
+supports-hyperlinks@^3.1.0:
+  version "3.1.0"
+  resolved "http://verdaccio.ds.io:4873/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz#b56150ff0173baacc15f21956450b61f2b18d3ac"
+  integrity sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==
+  dependencies:
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
+
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "http://verdaccio.ds.io:4873/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -15575,10 +15459,10 @@ tabbable@^6.0.1, tabbable@^6.2.0:
   resolved "http://verdaccio.ds.io:4873/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
   integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
 
-table@^6.6.0:
-  version "6.8.0"
-  resolved "http://verdaccio.ds.io:4873/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
-  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
+table@^6.8.2:
+  version "6.9.0"
+  resolved "http://verdaccio.ds.io:4873/table/-/table-6.9.0.tgz#50040afa6264141c7566b3b81d4d82c47a8668f5"
+  integrity sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -15887,11 +15771,6 @@ type-fest@^0.13.1:
   resolved "http://verdaccio.ds.io:4873/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
-type-fest@^0.18.0:
-  version "0.18.1"
-  resolved "http://verdaccio.ds.io:4873/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
-  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
-
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "http://verdaccio.ds.io:4873/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
@@ -15942,13 +15821,6 @@ type@^2.7.2:
   resolved "http://verdaccio.ds.io:4873/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
   integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "http://verdaccio.ds.io:4873/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "http://verdaccio.ds.io:4873/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -15959,6 +15831,11 @@ typescript@^4.5.5:
   resolved "http://verdaccio.ds.io:4873/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
   integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
 
+typescript@^5.6.3:
+  version "5.7.2"
+  resolved "http://verdaccio.ds.io:4873/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
+
 typewise-core@^1.2, typewise-core@^1.2.0:
   version "1.2.0"
   resolved "http://verdaccio.ds.io:4873/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195"
@@ -16083,18 +15960,6 @@ unified@^10.0.0:
     trough "^2.0.0"
     vfile "^5.0.0"
 
-unified@^9.1.0:
-  version "9.2.2"
-  resolved "http://verdaccio.ds.io:4873/unified/-/unified-9.2.2.tgz#67649a1abfc3ab85d2969502902775eb03146975"
-  integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==
-  dependencies:
-    bail "^1.0.0"
-    extend "^3.0.0"
-    is-buffer "^2.0.0"
-    is-plain-obj "^2.0.0"
-    trough "^1.0.0"
-    vfile "^4.0.0"
-
 union-value@^1.0.0, union-value@^1.0.1:
   version "1.0.1"
   resolved "http://verdaccio.ds.io:4873/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -16125,13 +15990,6 @@ unist-builder@^3.0.0:
   dependencies:
     "@types/unist" "^2.0.0"
 
-unist-util-find-all-after@^3.0.2:
-  version "3.0.2"
-  resolved "http://verdaccio.ds.io:4873/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"
-  integrity sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==
-  dependencies:
-    unist-util-is "^4.0.0"
-
 unist-util-generated@^1.0.0:
   version "1.1.6"
   resolved "http://verdaccio.ds.io:4873/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
@@ -16387,7 +16245,7 @@ uvu@^0.5.0:
     kleur "^4.0.3"
     sade "^1.7.3"
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
+v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "http://verdaccio.ds.io:4873/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -16755,16 +16613,6 @@ wrappy@1:
   resolved "http://verdaccio.ds.io:4873/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^3.0.3:
-  version "3.0.3"
-  resolved "http://verdaccio.ds.io:4873/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
 write-file-atomic@^4.0.1:
   version "4.0.1"
   resolved "http://verdaccio.ds.io:4873/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
@@ -16773,6 +16621,14 @@ write-file-atomic@^4.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
+write-file-atomic@^5.0.1:
+  version "5.0.1"
+  resolved "http://verdaccio.ds.io:4873/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
+  integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^4.0.1"
+
 ws@^8.2.3:
   version "8.8.1"
   resolved "http://verdaccio.ds.io:4873/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
@@ -16854,11 +16710,6 @@ yargs-parser@^18.1.3:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.2.3:
-  version "20.2.9"
-  resolved "http://verdaccio.ds.io:4873/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
 yargs-parser@^21.0.0, yargs-parser@^21.0.1:
   version "21.0.1"
   resolved "http://verdaccio.ds.io:4873/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
@@ -16922,4 +16773,4 @@ zwitch@^1.0.0:
 zwitch@^2.0.0:
   version "2.0.2"
   resolved "http://verdaccio.ds.io:4873/zwitch/-/zwitch-2.0.2.tgz#91f8d0e901ffa3d66599756dde7f57b17c95dce1"
-  integrity sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==
\ No newline at end of file
+  integrity sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==

From d0a4cd41001f751fb6854f22cf4e4b7255caf572 Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Tue, 10 Dec 2024 17:04:48 -0500
Subject: [PATCH 14/35] updating styles

---
 .../components/common/page-footer/index.tsx   |  6 ++++--
 .../components/common/page-footer/styles.scss | 19 ++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 62f60f5b5..d51b8ee08 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Icon } from '@trussworks/react-uswds';
+//TO DO: need to move NasaLogoColor outside of component and pass down as props
 import NasaLogoColor from '../../nasa-logo-color.js';
 import {
   USWDSFooter,
@@ -13,7 +14,7 @@ interface PageFooterProps {
   settings: any;
   hidefooter?: boolean;
 }
-
+//TODO: clean up PageFooterProps
 export default function PageFooter({
   settings,
   primarySection,
@@ -45,7 +46,7 @@ export default function PageFooter({
         primary={
           <div
             id='footer_primary_container'
-            className=' grid-row bg-base-lightest'
+            className=' grid-row bg-base-lightest usa-footer__primary-container'
           >
             <div className='mobile-lg:grid-col-8'>
               <USWDSFooterNav
@@ -61,6 +62,7 @@ export default function PageFooter({
             <div className='tablet:grid-col-4'>
               <USWDSAddress
                 size='slim'
+                id='footer_address_links'
                 className='flex-justify-end'
                 items={[
                   <a className='usa-link text-base-dark' key='#' href='#'>
diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index 081445a8c..b2bf034b5 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -21,12 +21,6 @@
      */
   }
 
-  // @media (width <= themeVars.$veda-uswds-spacing-desktop) {
-  //   #nasa-logo-pos {
-  //     display: none;
-  //   }
-  // }
-
   svg {
     height: 2.75rem;
     width: auto;
@@ -43,21 +37,16 @@
 
 #return-to-top-container {
   padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
+  max-width: 64rem;
 }
 #footer_primary_container {
   padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
   background-color: themeVars.$veda-uswds-color-base-lightest;
 }
-
 .usa-footer__secondary-section {
   background-color: themeVars.$veda-uswds-color-base-darkest;
-  padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
-  & > .grid-container {
-    max-width: 100%;
-    padding: 0;
-    //NEED to determine how to remove 64rem max-width on grid-container
-  }
 }
+
 .usa-footer__primary-section {
   background-color: themeVars.$veda-uswds-color-base-lightest;
 }
@@ -70,3 +59,7 @@
 .usa-footer__address > .grid-row {
   justify-content: flex-end;
 }
+#footer_address_links {
+  color: themeVars.$veda-uswds-color-base-dark;
+  font-style: normal;
+}

From 59dd97ea19c4c36a29ba0f0ce94f9bfb93811e25 Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Tue, 10 Dec 2024 17:16:42 -0500
Subject: [PATCH 15/35] dialing in css

---
 app/scripts/components/common/page-footer/index.tsx   | 1 -
 app/scripts/components/common/page-footer/styles.scss | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index d51b8ee08..e294605f3 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -62,7 +62,6 @@ export default function PageFooter({
             <div className='tablet:grid-col-4'>
               <USWDSAddress
                 size='slim'
-                id='footer_address_links'
                 className='flex-justify-end'
                 items={[
                   <a className='usa-link text-base-dark' key='#' href='#'>
diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index b2bf034b5..b4bcb95fa 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -49,6 +49,8 @@
 
 .usa-footer__primary-section {
   background-color: themeVars.$veda-uswds-color-base-lightest;
+  text-underline-offset: themeVars.$veda-uswds-spacing-5;
+
 }
 
 #mail_icon {
@@ -59,7 +61,10 @@
 .usa-footer__address > .grid-row {
   justify-content: flex-end;
 }
-#footer_address_links {
-  color: themeVars.$veda-uswds-color-base-dark;
+
+address {
   font-style: normal;
+  font-weight: themeVars.$veda-uswds-fontweight-regular;
+  font-size: themeVars.$veda-uswds-fontsize-sm;
+  text-underline-offset: themeVars.$veda-uswds-spacing-5;
 }

From e2afeed4acbdfb008359f3b9a9f6a5f293622b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Wed, 11 Dec 2024 12:13:52 +0100
Subject: [PATCH 16/35] Fix hideFooter prop name

---
 app/scripts/components/common/layout-root/index.tsx |  2 +-
 app/scripts/components/common/page-footer/index.tsx | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 04c7bbe8c..50c32547d 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -113,7 +113,7 @@ function LayoutRoot(props: { children?: ReactNode }) {
           primarySection={{
             footerPrimaryContactItems,
             footerPrimaryNavItems
-          }} // @ts-expect-error: NEED TO DELETE
+          }}
           hideFooter={hideFooter}
         />
       ) : (
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index e294605f3..72a64ca73 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -12,15 +12,15 @@ import './styles.scss';
 interface PageFooterProps {
   primarySection: any;
   settings: any;
-  hidefooter?: boolean;
+  hideFooter?: boolean;
 }
-//TODO: clean up PageFooterProps
+//TODO: clean up PageFooterProps, Unexpected any. Specify a different interface.
+
 export default function PageFooter({
   settings,
   primarySection,
-  hidefooter
+  hideFooter
 }: PageFooterProps) {
-  // console.log(settings, primarySection, hidefooter);
   const returnToTopButton = () => {
     return (
       <div
@@ -42,7 +42,7 @@ export default function PageFooter({
       <USWDSFooter
         size='slim'
         returnToTop={returnToTop && returnToTopButton()}
-        className={hidefooter && 'display-none'}
+        className={hideFooter && 'display-none'}
         primary={
           <div
             id='footer_primary_container'

From 9f4a2fd80bcfb335df8081d846d115c1c3b600f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Wed, 11 Dec 2024 12:16:13 +0100
Subject: [PATCH 17/35] Add back comments to .env

---
 .env | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.env b/.env
index 2242b2db2..b160b8f44 100644
--- a/.env
+++ b/.env
@@ -14,5 +14,7 @@ GOOGLE_FORM = 'https://docs.google.com/forms/d/e/1FAIpQLSfGcd3FDsM3kQIOVKjzdPn4f
 
 SHOW_CONFIGURABLE_COLOR_MAP = 'TRUE'
 
+# Enables the refactor page header component that uses the USWDS design system
 ENABLE_USWDS_PAGE_HEADER = 'TRUE'
+# Enables the refactor page footer component that uses the USWDS design system
 ENABLE_USWDS_PAGE_FOOTER = 'TRUE'

From fe545d454fa6c06f1c1668f2ddfa1181e80c114b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Wed, 11 Dec 2024 12:22:11 +0100
Subject: [PATCH 18/35] Remove duplicated styles

---
 .../components/common/page-footer/styles.scss | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index b4bcb95fa..ebeee5edc 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -1,31 +1,5 @@
 @use '$styles/veda-ui-theme-vars.scss' as themeVars;
 
-#logo-container {
-  display: flex;
-  font-family: themeVars.$veda-uswds-basefont-sans;
-  gap: themeVars.$veda-uswds-spacing-105;
-
-  #logo-container-link {
-    display: flex;
-    align-items: center;
-    gap: themeVars.$veda-uswds-spacing-105;
-    font-weight: themeVars.$veda-uswds-fontweight-bold;
-    font-size: themeVars.$veda-uswds-fontsize-lg;
-  }
-
-  #nasa-logo-pos {
-    opacity: 1;
-    transform: translate(0, -100%);
-    /* TODO: Fix the svg to not require any styles!
-     * - set opacity to 1 in svg and fix translation
-     */
-  }
-
-  svg {
-    height: 2.75rem;
-    width: auto;
-  }
-}
 .footer-text {
   color: white;
   align-self: center;
@@ -50,7 +24,6 @@
 .usa-footer__primary-section {
   background-color: themeVars.$veda-uswds-color-base-lightest;
   text-underline-offset: themeVars.$veda-uswds-spacing-5;
-
 }
 
 #mail_icon {

From f224268e6d6bba3679f92e095f2367dbd70a222f Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Wed, 11 Dec 2024 17:19:04 -0500
Subject: [PATCH 19/35] wiring up menu items

---
 .../components/common/layout-root/index.tsx   |  6 +-
 .../components/common/page-footer/index.tsx   | 73 ++++++++++++++-----
 2 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 04c7bbe8c..c5a3d3577 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -112,8 +112,10 @@ function LayoutRoot(props: { children?: ReactNode }) {
           settings={footerSettings}
           primarySection={{
             footerPrimaryContactItems,
-            footerPrimaryNavItems
-          }} // @ts-expect-error: NEED TO DELETE
+            footerPrimaryNavItems,
+            mainNavItems,
+            subNavItems
+          }}
           hideFooter={hideFooter}
         />
       ) : (
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index e294605f3..c5414710d 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,12 +1,15 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Icon } from '@trussworks/react-uswds';
 //TO DO: need to move NasaLogoColor outside of component and pass down as props
 import NasaLogoColor from '../../nasa-logo-color.js';
+import { NavItemType } from '../page-header/types.js';
+import { NavItemCTA } from '../page-header/nav/nav-item-cta.js';
 import {
   USWDSFooter,
   USWDSFooterNav,
   USWDSAddress
 } from '$components/common/uswds';
+
 import './styles.scss';
 
 interface PageFooterProps {
@@ -20,7 +23,7 @@ export default function PageFooter({
   primarySection,
   hidefooter
 }: PageFooterProps) {
-  // console.log(settings, primarySection, hidefooter);
+  console.log(settings, primarySection, hidefooter);
   const returnToTopButton = () => {
     return (
       <div
@@ -36,7 +39,53 @@ export default function PageFooter({
 
   const { returnToTop, secondarySection } = settings;
   /* eslint-disable */
-  const { footerPrimaryContactItems, footerPrimaryNavItems } = primarySection;
+  const {
+    footerPrimaryContactItems,
+    footerPrimaryNavItems,
+    mainNavItems,
+    subNavItems
+  } = primarySection;
+
+  const createNavElement = (navItems, linkClasses) => {
+    //removing 'dropdown' items from array
+    let cleanedNavItems = navItems.filter((a) => {
+      if (a.type !== 'dropdown') {
+        return a;
+      }
+    });
+
+    return cleanedNavItems.map((item) => {
+      switch (item.type) {
+        case NavItemType.ACTION:
+          return <NavItemCTA item={item} />;
+
+        case NavItemType.EXTERNAL_LINK:
+          return (
+            <a className={linkClasses} href={item.to} key={item.id}>
+              {item.title}
+            </a>
+          );
+        case NavItemType.INTERNAL_LINK:
+          return (
+            <a className={linkClasses} href={item.to} key={item.id}>
+              {item.title}
+            </a>
+          );
+
+        default:
+          return <></>;
+      }
+    });
+  };
+
+  const primaryItems = useMemo(
+    () => createNavElement(mainNavItems, 'usa-footer__primary-link'),
+    [mainNavItems]
+  );
+  const secondaryItems = useMemo(
+    () => createNavElement(subNavItems, 'usa-link text-base-dark'),
+    [mainNavItems]
+  );
   return (
     <>
       <USWDSFooter
@@ -52,28 +101,14 @@ export default function PageFooter({
               <USWDSFooterNav
                 aria-label='Footer navigation'
                 size='slim'
-                links={Array(4).fill(
-                  <a className='usa-footer__primary-link' href='#'>
-                    PrimaryLink
-                  </a>
-                )}
+                links={primaryItems}
               />
             </div>
             <div className='tablet:grid-col-4'>
               <USWDSAddress
                 size='slim'
                 className='flex-justify-end'
-                items={[
-                  <a className='usa-link text-base-dark' key='#' href='#'>
-                    News and Events
-                  </a>,
-                  <a className='usa-link text-base-dark' key='#' href='#'>
-                    About
-                  </a>,
-                  <a className='usa-link text-base-dark' key='#' href='#'>
-                    Contact Us
-                  </a>
-                ]}
+                items={secondaryItems}
               />
             </div>
           </div>

From 89a9421a46c9ada8ce060461cf6125f0de93bf80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Wed, 11 Dec 2024 13:09:25 +0100
Subject: [PATCH 20/35] fix: svg logo to not require css styles

---
 .../components/common/nasa-logo-color.js      | 452 ++++++++++--------
 .../components/common/page-footer/index.tsx   |   4 +-
 .../page-header/logo-container/styles.scss    |  16 +-
 app/scripts/components/nasa-logo-color.js     | 217 ---------
 4 files changed, 249 insertions(+), 440 deletions(-)
 delete mode 100644 app/scripts/components/nasa-logo-color.js

diff --git a/app/scripts/components/common/nasa-logo-color.js b/app/scripts/components/common/nasa-logo-color.js
index b85ff9b3b..d9b6b33bf 100644
--- a/app/scripts/components/common/nasa-logo-color.js
+++ b/app/scripts/components/common/nasa-logo-color.js
@@ -1,216 +1,254 @@
 import React from 'react';
 
+// svg from https://www.figma.com/design/5mclPTReHcRIzKbJm8YA6a/VEDA---USWDS?node-id=241-1609&node-type=symbol&t=H3LqNnn3tzAsfBg1-0
+
 export default function NasaLogoColor() {
   return (
     <svg
-      width={312}
-      height={258}
-      viewBox='0 0 312 258'
-      style={{
-        fillRule: 'evenodd',
-        clipRule: 'evenodd',
-        strokeLinejoin: 'round',
-        strokeMiterlimit: 2
-      }}
+      width='44'
+      height='44'
+      viewBox='0 0 44 44'
+      fill='none'
+      xmlns='http://www.w3.org/2000/svg'
     >
-      <title>NASA</title>
-      <g id='nasa-logo-pos'>
-        <path
-          d='M273.427,387C273.427,457.761 215.188,516 144.427,516C73.665,516 15.427,457.761 15.427,387C15.427,316.239 73.665,258 144.427,258C215.188,258 273.427,316.239 273.427,387Z'
-          style={{ fill: 'rgb(0,102,179)', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M146.205,269.721C146.205,270.297 145.731,270.771 145.154,270.771C144.578,270.771 144.104,270.297 144.104,269.721C144.104,269.145 144.578,268.67 145.154,268.67C145.731,268.67 146.205,269.145 146.205,269.721Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M153.48,285.643C153.48,286.353 152.896,286.936 152.187,286.936C151.477,286.936 150.893,286.353 150.893,285.643C150.893,284.934 151.477,284.35 152.187,284.35C152.896,284.35 153.48,284.934 153.48,285.643Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M172.393,311.67C172.393,312.379 171.81,312.963 171.1,312.963C170.39,312.963 169.807,312.379 169.807,311.67C169.807,310.959 170.39,310.376 171.1,310.376C171.81,310.376 172.393,310.959 172.393,311.67Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M142.002,294.615C142.002,295.191 141.528,295.666 140.951,295.666C140.375,295.666 139.901,295.191 139.901,294.615C139.901,294.039 140.375,293.564 140.951,293.564C141.528,293.564 142.002,294.039 142.002,294.615Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M153.318,300.596C153.318,301.172 152.843,301.647 152.267,301.647C151.691,301.647 151.217,301.172 151.217,300.596C151.217,300.02 151.691,299.545 152.267,299.545C152.843,299.545 153.318,300.02 153.318,300.596Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M138.607,283.865C138.607,284.574 138.023,285.158 137.314,285.158C136.604,285.158 136.021,284.574 136.021,283.865C136.021,283.156 136.604,282.572 137.314,282.572C138.023,282.572 138.607,283.156 138.607,283.865Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M121.472,294.292C121.472,294.869 120.998,295.343 120.422,295.343C119.845,295.343 119.371,294.869 119.371,294.292C119.371,293.716 119.845,293.241 120.422,293.241C120.998,293.241 121.472,293.716 121.472,294.292Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M124.544,296.394C124.544,296.97 124.069,297.444 123.493,297.444C122.917,297.444 122.442,296.97 122.442,296.394C122.442,295.817 122.917,295.343 123.493,295.343C124.069,295.343 124.544,295.817 124.544,296.394Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M127.615,298.495C127.615,299.071 127.14,299.545 126.564,299.545C125.987,299.545 125.513,299.071 125.513,298.495C125.513,297.918 125.987,297.444 126.564,297.444C127.14,297.444 127.615,297.918 127.615,298.495Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M122.927,302.536C122.927,303.112 122.453,303.587 121.877,303.587C121.3,303.587 120.826,303.112 120.826,302.536C120.826,301.959 121.3,301.485 121.877,301.485C122.453,301.485 122.927,301.959 122.927,302.536Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M98.517,319.671C98.517,320.248 98.043,320.722 97.466,320.722C96.89,320.722 96.415,320.248 96.415,319.671C96.415,319.095 96.89,318.621 97.466,318.621C98.043,318.621 98.517,319.095 98.517,319.671Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M103.044,325.168C103.044,325.744 102.569,326.218 101.993,326.218C101.417,326.218 100.942,325.744 100.942,325.168C100.942,324.591 101.417,324.117 101.993,324.117C102.569,324.117 103.044,324.591 103.044,325.168Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M99.487,413.915C99.487,414.491 99.012,414.966 98.436,414.966C97.86,414.966 97.385,414.491 97.385,413.915C97.385,413.339 97.86,412.864 98.436,412.864C99.012,412.864 99.487,413.339 99.487,413.915Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M100.134,438.404C100.134,439.115 99.549,439.699 98.84,439.699C98.131,439.699 97.547,439.115 97.547,438.404C97.547,437.696 98.131,437.113 98.84,437.113C99.549,437.113 100.134,437.696 100.134,438.404Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M86.231,450.935C86.231,451.511 85.756,451.986 85.18,451.986C84.604,451.986 84.13,451.511 84.13,450.935C84.13,450.357 84.604,449.884 85.18,449.884C85.756,449.884 86.231,450.357 86.231,450.935Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M69.58,456.027C69.58,456.736 68.996,457.32 68.287,457.32C67.578,457.32 66.994,456.736 66.994,456.027C66.994,455.316 67.578,454.732 68.287,454.732C68.996,454.732 69.58,455.316 69.58,456.027Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M66.186,444.71C66.186,445.419 65.602,446.003 64.893,446.003C64.183,446.003 63.599,445.419 63.599,444.71C63.599,444.001 64.183,443.417 64.893,443.417C65.602,443.417 66.186,444.001 66.186,444.71Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M64.246,451.904C64.246,452.48 63.772,452.954 63.195,452.954C62.619,452.954 62.145,452.48 62.145,451.904C62.145,451.327 62.619,450.853 63.195,450.853C63.772,450.853 64.246,451.327 64.246,451.904Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M51.798,445.923C51.798,446.499 51.324,446.974 50.747,446.974C50.171,446.974 49.697,446.499 49.697,445.923C49.697,445.347 50.171,444.872 50.747,444.872C51.324,444.872 51.798,445.347 51.798,445.923Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M95.283,466.129C95.283,466.705 94.809,467.18 94.233,467.18C93.656,467.18 93.182,466.705 93.182,466.129C93.182,465.553 93.656,465.078 94.233,465.078C94.809,465.078 95.283,465.553 95.283,466.129Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M108.378,456.511C108.378,457.22 107.794,457.804 107.085,457.804C106.376,457.804 105.792,457.22 105.792,456.511C105.792,455.802 106.376,455.218 107.085,455.218C107.794,455.218 108.378,455.802 108.378,456.511Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M109.833,468.877C109.833,469.453 109.359,469.928 108.782,469.928C108.206,469.928 107.731,469.453 107.731,468.877C107.731,468.301 108.206,467.828 108.782,467.828C109.359,467.828 109.833,468.301 109.833,468.877Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M163.664,457.077C163.664,457.654 163.19,458.128 162.613,458.128C162.037,458.128 161.563,457.654 161.563,457.077C161.563,456.499 162.037,456.027 162.613,456.027C163.19,456.027 163.664,456.499 163.664,457.077Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M138.607,465.967C138.607,466.545 138.132,467.018 137.556,467.018C136.98,467.018 136.506,466.545 136.506,465.967C136.506,465.391 136.98,464.918 137.556,464.918C138.132,464.918 138.607,465.391 138.607,465.967Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M206.017,478.739C206.017,479.315 205.543,479.789 204.966,479.789C204.39,479.789 203.915,479.315 203.915,478.739C203.915,478.162 204.39,477.688 204.966,477.688C205.543,477.688 206.017,478.162 206.017,478.739Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M211.513,429.029C211.513,429.738 210.929,430.322 210.22,430.322C209.511,430.322 208.927,429.738 208.927,429.029C208.927,428.321 209.511,427.737 210.22,427.737C210.929,427.737 211.513,428.321 211.513,429.029Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M201.167,436.061C201.167,436.639 200.693,437.113 200.116,437.113C199.54,437.113 199.066,436.639 199.066,436.061C199.066,435.487 199.54,435.012 200.116,435.012C200.693,435.012 201.167,435.487 201.167,436.061Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M211.352,438.082C211.352,438.791 210.768,439.375 210.059,439.375C209.35,439.375 208.766,438.791 208.766,438.082C208.766,437.373 209.35,436.789 210.059,436.789C210.768,436.789 211.352,437.373 211.352,438.082Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M201.167,450.611C201.167,451.187 200.693,451.661 200.116,451.661C199.54,451.661 199.066,451.187 199.066,450.611C199.066,450.034 199.54,449.56 200.116,449.56C200.693,449.56 201.167,450.034 201.167,450.611Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M227.517,421.998C227.517,422.574 227.043,423.049 226.467,423.049C225.889,423.049 225.414,422.574 225.414,421.998C225.414,421.422 225.889,420.947 226.467,420.947C227.043,420.947 227.517,421.422 227.517,421.998Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M230.104,428.383C230.104,429.094 229.52,429.676 228.811,429.676C228.101,429.676 227.517,429.094 227.517,428.383C227.517,427.674 228.101,427.09 228.811,427.09C229.52,427.09 230.104,427.674 230.104,428.383Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M248.209,435.981C248.209,436.69 247.625,437.274 246.915,437.274C246.205,437.274 245.621,436.69 245.621,435.981C245.621,435.272 246.205,434.688 246.915,434.688C247.625,434.688 248.209,435.272 248.209,435.981Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M229.781,449.48C229.781,450.056 229.306,450.53 228.73,450.53C228.154,450.53 227.679,450.056 227.679,449.48C227.679,448.904 228.154,448.429 228.73,448.429C229.306,448.429 229.781,448.904 229.781,449.48Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M241.419,438.487C241.419,439.063 240.945,439.537 240.368,439.537C239.792,439.537 239.318,439.063 239.318,438.487C239.318,437.91 239.792,437.436 240.368,437.436C240.945,437.436 241.419,437.91 241.419,438.487Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M239.318,455.46C239.318,456.036 238.843,456.511 238.267,456.511C237.691,456.511 237.216,456.036 237.216,455.46C237.216,454.884 237.691,454.409 238.267,454.409C238.843,454.409 239.318,454.884 239.318,455.46Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M168.848,282.647C169.026,281.99 169.558,281.478 170.227,281.329L170.594,278.562L171.137,281.355C171.785,281.54 172.287,282.07 172.434,282.733L175.235,283.13L172.408,283.628C172.23,284.267 171.717,284.765 171.07,284.923L170.594,287.77L170.114,284.902C169.485,284.72 168.993,284.21 168.837,283.569L166.135,283.13L168.848,282.647Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M96.37,480.946C96.548,480.289 97.081,479.776 97.749,479.627L98.117,476.862L98.661,479.655C99.308,479.838 99.811,480.367 99.956,481.031L102.758,481.428L99.931,481.926C99.753,482.565 99.239,483.063 98.592,483.221L98.117,486.07L97.637,483.201C97.007,483.018 96.516,482.508 96.359,481.867L93.657,481.428L96.37,480.946Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M229.659,455.38C229.837,454.722 230.368,454.21 231.037,454.062L231.405,451.294L231.949,454.087C232.596,454.271 233.099,454.802 233.244,455.466L236.045,455.863L233.219,456.361C233.04,456.999 232.528,457.497 231.88,457.655L231.405,460.503L230.925,457.634C230.295,457.452 229.805,456.941 229.648,456.302L226.947,455.863L229.659,455.38Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M240.211,426.869C240.388,426.211 240.92,425.699 241.588,425.551L241.956,422.783L242.5,425.576C243.148,425.762 243.651,426.291 243.796,426.955L246.597,427.352L243.771,427.85C243.592,428.488 243.079,428.987 242.433,429.145L241.956,431.992L241.477,429.123C240.847,428.942 240.357,428.432 240.2,427.791L237.497,427.352L240.211,426.869Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M109.303,321.556C109.481,320.898 110.013,320.387 110.681,320.237L111.049,317.471L111.593,320.264C112.241,320.448 112.743,320.978 112.889,321.642L115.69,322.039L112.863,322.536C112.685,323.175 112.172,323.674 111.525,323.832L111.049,326.679L110.569,323.811C109.94,323.628 109.449,323.118 109.293,322.478L106.59,322.039L109.303,321.556Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M100.756,381.578C110.286,398.228 121.393,410.411 130.341,421.988C138.283,432.264 153.757,437.408 148.307,442.286C142.164,447.782 127.292,423.533 127.292,423.533C117.408,411.614 107.949,398.97 98.299,382.433L100.756,381.578Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M0,425.268C46.046,395.026 126.409,375.502 192.597,349.225C242.884,329.26 287.601,304.198 311.639,269.689C250.721,393.777 81.066,379.089 3.312,426.424L0,425.268Z'
-          style={{ fill: 'rgb(237,28,36)', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M107.05,363.738L130.11,363.738L146.644,405.374L152.155,410.905L122.134,410.905L127.645,405.374L125.687,400.294L109.117,400.294L107.413,406.103L111.365,410.905L95.701,410.905L101.213,405.374L111.837,368.554L107.05,363.738ZM122.751,393.004L116.078,376.098L111.184,393.004L122.751,393.004Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M214.184,363.738L238.118,363.738L254.653,405.374L260.164,410.905L230.143,410.905L235.654,405.374L233.696,400.294L217.125,400.294L215.421,406.103L219.373,410.905L203.71,410.905L209.222,405.374L219.845,368.554L214.184,363.738ZM230.759,393.004L224.087,376.098L219.192,393.004L230.759,393.004Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M75.758,393.113L75.758,368.554L70.972,363.738L86.925,363.738L82.14,368.554L82.14,405.374L87.651,410.905L66.693,410.905L48.637,380.361L48.637,405.374L53.277,410.905L36.6,410.905L42.111,405.374L42.111,368.554L37.325,363.738L58.21,363.738L75.758,393.113Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M196.553,375.835L196.063,361.15L191.12,364.562C184.156,362.127 176.051,362.219 170.364,364.91C165.071,367.415 159.36,372.704 160.055,380.22C160.752,387.736 166.577,390.645 171.826,393.024C178.582,396.086 185.936,397.121 185.827,401.167C185.757,403.741 181.485,405.587 178.165,405.482C175.135,405.386 165.28,404.646 160.125,398.523L161.101,413.97L166.604,409.935C173.289,412.3 181.392,413.292 188.889,410.847C196.341,408.419 204.174,402.183 199.827,391.285C197.956,386.596 192.804,383.705 189.731,382.447C186.917,381.295 178.333,377.92 175.936,376.671C173.136,375.212 173.448,370.582 180.185,369.642C186.288,368.791 194.742,373.678 196.553,375.835Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M35.658,497.677C128.131,403.298 265.971,359.693 311.639,269.689C284.138,357.193 136.85,405.454 35.408,502.115L35.658,497.677Z'
-          style={{ fill: 'rgb(237,28,36)', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M98.299,382.433C97.216,380.577 96.131,378.672 95.042,376.714C70.388,332.361 73.944,287.098 118.563,306.82C156.431,323.559 192.6,370.511 207.146,403.857C213.887,419.307 231.96,479.946 173.764,455.374L173.65,455.019C228.613,477.651 219.111,420.301 189.691,376.331C173.042,351.45 151.331,330.725 137.637,320.722C92.05,287.421 64.246,307.79 96.253,373.097C97.702,376.053 99.208,378.875 100.756,381.578L98.299,382.433Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
+      <g id='NASA_logo'>
+        <path
+          id='Vector'
+          d='M20.3614 39.939C30.26 39.939 38.2843 31.9146 38.2843 22.016C38.2843 12.1174 30.26 4.09303 20.3614 4.09303C10.4628 4.09303 2.43839 12.1174 2.43839 22.016C2.43839 31.9146 10.4628 39.939 20.3614 39.939Z'
+          fill='#0C448C'
+        />
+        <g id='Group'>
+          <path
+            id='Vector_2'
+            d='M19.3031 7.73658C19.4141 7.73658 19.5041 7.64662 19.5041 7.53565C19.5041 7.42468 19.4141 7.33472 19.3031 7.33472C19.1922 7.33472 19.1022 7.42468 19.1022 7.53565C19.1022 7.64662 19.1922 7.73658 19.3031 7.73658Z'
+            fill='white'
+          />
+          <path
+            id='Vector_3'
+            d='M21.366 8.00449C21.477 8.00449 21.567 7.91453 21.567 7.80356C21.567 7.69259 21.477 7.60263 21.366 7.60263C21.2551 7.60263 21.1651 7.69259 21.1651 7.80356C21.1651 7.91453 21.2551 8.00449 21.366 8.00449Z'
+            fill='white'
+          />
+          <path
+            id='Vector_4'
+            d='M24.0719 11.648C24.1829 11.648 24.2728 11.5581 24.2728 11.4471C24.2728 11.3361 24.1829 11.2462 24.0719 11.2462C23.9609 11.2462 23.871 11.3361 23.871 11.4471C23.871 11.5581 23.9609 11.648 24.0719 11.648Z'
+            fill='white'
+          />
+          <path
+            id='Vector_5'
+            d='M9.22985 30.4015C9.34082 30.4015 9.43078 30.3116 9.43078 30.2006C9.43078 30.0896 9.34082 29.9997 9.22985 29.9997C9.11888 29.9997 9.02892 30.0896 9.02892 30.2006C9.02892 30.3116 9.11888 30.4015 9.22985 30.4015Z'
+            fill='white'
+          />
+          <path
+            id='Vector_6'
+            d='M9.75226 32.009C9.86323 32.009 9.95319 31.919 9.95319 31.808C9.95319 31.6971 9.86323 31.6071 9.75226 31.6071C9.64129 31.6071 9.55133 31.6971 9.55133 31.808C9.55133 31.919 9.64129 32.009 9.75226 32.009Z'
+            fill='white'
+          />
+          <path
+            id='Vector_7'
+            d='M7.26072 30.5922C7.34383 30.5922 7.4112 30.5248 7.4112 30.4417C7.4112 30.3586 7.34383 30.2912 7.26072 30.2912C7.17762 30.2912 7.11025 30.3586 7.11025 30.4417C7.11025 30.5248 7.17762 30.5922 7.26072 30.5922Z'
+            fill='white'
+          />
+          <path
+            id='Vector_8'
+            d='M15.4319 33.7504C15.5152 33.7504 15.5828 33.6828 15.5828 33.5995C15.5828 33.5161 15.5152 33.4485 15.4319 33.4485C15.3485 33.4485 15.281 33.5161 15.281 33.5995C15.281 33.6828 15.3485 33.7504 15.4319 33.7504Z'
+            fill='white'
+          />
+          <path
+            id='Vector_9'
+            d='M28.2477 31.0878C28.3308 31.0878 28.3981 31.0204 28.3981 30.9373C28.3981 30.8542 28.3308 30.7869 28.2477 30.7869C28.1645 30.7869 28.0972 30.8542 28.0972 30.9373C28.0972 31.0204 28.1645 31.0878 28.2477 31.0878Z'
+            fill='white'
+          />
+          <path
+            id='Vector_10'
+            d='M31.972 27.0429C32.0554 27.0429 32.1229 26.9753 32.1229 26.8919C32.1229 26.8086 32.0554 26.741 31.972 26.741C31.8887 26.741 31.8211 26.8086 31.8211 26.8919C31.8211 26.9753 31.8887 27.0429 31.972 27.0429Z'
+            fill='white'
+          />
+          <path
+            id='Vector_11'
+            d='M13.7173 12.7728C13.8004 12.7728 13.8678 12.7054 13.8678 12.6223C13.8678 12.5392 13.8004 12.4718 13.7173 12.4718C13.6342 12.4718 13.5668 12.5392 13.5668 12.6223C13.5668 12.7054 13.6342 12.7728 13.7173 12.7728Z'
+            fill='white'
+          />
+          <path
+            id='Vector_12'
+            d='M17.8163 9.76241C17.8994 9.76241 17.9667 9.69504 17.9667 9.61193C17.9667 9.52883 17.8994 9.46146 17.8163 9.46146C17.7332 9.46146 17.6658 9.52883 17.6658 9.61193C17.6658 9.69504 17.7332 9.76241 17.8163 9.76241Z'
+            fill='white'
+          />
+          <path
+            id='Vector_13'
+            d='M17.3711 9.46771C17.4542 9.46771 17.5216 9.40034 17.5216 9.31723C17.5216 9.23413 17.4542 9.16676 17.3711 9.16676C17.288 9.16676 17.2206 9.23413 17.2206 9.31723C17.2206 9.40034 17.288 9.46771 17.3711 9.46771Z'
+            fill='white'
+          />
+          <path
+            id='Vector_14'
+            d='M16.9692 9.17301C17.0523 9.17301 17.1197 9.10564 17.1197 9.02254C17.1197 8.93943 17.0523 8.87206 16.9692 8.87206C16.8861 8.87206 16.8187 8.93943 16.8187 9.02254C16.8187 9.10564 16.8861 9.17301 16.9692 9.17301Z'
+            fill='white'
+          />
+          <path
+            id='Vector_15'
+            d='M14.3603 13.5502C14.4434 13.5502 14.5107 13.4828 14.5107 13.3997C14.5107 13.3166 14.4434 13.2492 14.3603 13.2492C14.2772 13.2492 14.2098 13.3166 14.2098 13.3997C14.2098 13.4828 14.2772 13.5502 14.3603 13.5502Z'
+            fill='white'
+          />
+          <path
+            id='Vector_16'
+            d='M20.398 5.71701C20.4811 5.71701 20.5485 5.64964 20.5485 5.56654C20.5485 5.48343 20.4811 5.41606 20.398 5.41606C20.3149 5.41606 20.2475 5.48343 20.2475 5.56654C20.2475 5.64964 20.3149 5.71701 20.398 5.71701Z'
+            fill='white'
+          />
+          <path
+            id='Vector_17'
+            d='M21.3897 10.0571C21.4728 10.0571 21.5402 9.98973 21.5402 9.90663C21.5402 9.82352 21.4728 9.75615 21.3897 9.75615C21.3066 9.75615 21.2392 9.82352 21.2392 9.90663C21.2392 9.98973 21.3066 10.0571 21.3897 10.0571Z'
+            fill='white'
+          />
+          <path
+            id='Vector_18'
+            d='M19.8256 9.20962C19.9087 9.20962 19.976 9.14225 19.976 9.05915C19.976 8.97604 19.9087 8.90867 19.8256 8.90867C19.7425 8.90867 19.6751 8.97604 19.6751 9.05915C19.6751 9.14225 19.7425 9.20962 19.8256 9.20962Z'
+            fill='white'
+          />
+          <path
+            id='Vector_19'
+            d='M17.1465 10.3621C17.2296 10.3621 17.297 10.2947 17.297 10.2116C17.297 10.1285 17.2296 10.0611 17.1465 10.0611C17.0634 10.0611 16.996 10.1285 16.996 10.2116C16.996 10.2947 17.0634 10.3621 17.1465 10.3621Z'
+            fill='white'
+          />
+          <path
+            id='Vector_20'
+            d='M28.9612 35.0631C29.0443 35.0631 29.1116 34.9957 29.1116 34.9126C29.1116 34.8295 29.0443 34.7622 28.9612 34.7622C28.8781 34.7622 28.8107 34.8295 28.8107 34.9126C28.8107 34.9957 28.8781 35.0631 28.9612 35.0631Z'
+            fill='white'
+          />
+          <path
+            id='Vector_21'
+            d='M8.97534 31.3696C9.05869 31.3696 9.12626 31.302 9.12626 31.2186C9.12626 31.1353 9.05869 31.0677 8.97534 31.0677C8.89199 31.0677 8.82442 31.1353 8.82442 31.2186C8.82442 31.302 8.89199 31.3696 8.97534 31.3696Z'
+            fill='white'
+          />
+          <path
+            id='Vector_22'
+            d='M19.4505 33.3119C19.5338 33.3119 19.6014 33.2443 19.6014 33.161C19.6014 33.0776 19.5338 33.01 19.4505 33.01C19.3671 33.01 19.2996 33.0776 19.2996 33.161C19.2996 33.2443 19.3671 33.3119 19.4505 33.3119Z'
+            fill='white'
+          />
+          <path
+            id='Vector_23'
+            d='M12.0929 31.249C12.1762 31.249 12.2438 31.1814 12.2438 31.0981C12.2438 31.0147 12.1762 30.9472 12.0929 30.9472C12.0095 30.9472 11.942 31.0147 11.942 31.0981C11.942 31.1814 12.0095 31.249 12.0929 31.249Z'
+            fill='white'
+          />
+          <path
+            id='Vector_24'
+            d='M13.3958 33.3757C13.4792 33.3757 13.5467 33.3082 13.5467 33.2248C13.5467 33.1415 13.4792 33.0739 13.3958 33.0739C13.3124 33.0739 13.2449 33.1415 13.2449 33.2248C13.2449 33.3082 13.3124 33.3757 13.3958 33.3757Z'
+            fill='white'
+          />
+          <path
+            id='Vector_25'
+            d='M22.9869 32.0357C23.07 32.0357 23.1373 31.9684 23.1373 31.8853C23.1373 31.8022 23.07 31.7348 22.9869 31.7348C22.9037 31.7348 22.8364 31.8022 22.8364 31.8853C22.8364 31.9684 22.9037 32.0357 22.9869 32.0357Z'
+            fill='white'
+          />
+          <path
+            id='Vector_26'
+            d='M28.2744 29.0517C28.3575 29.0517 28.4249 28.9844 28.4249 28.9013C28.4249 28.8181 28.3575 28.7508 28.2744 28.7508C28.1913 28.7508 28.124 28.8181 28.124 28.9013C28.124 28.9844 28.1913 29.0517 28.2744 29.0517Z'
+            fill='white'
+          />
+          <path
+            id='Vector_27'
+            d='M32.2833 30.8833C32.3664 30.8833 32.4337 30.816 32.4337 30.7329C32.4337 30.6498 32.3664 30.5824 32.2833 30.5824C32.2002 30.5824 32.1328 30.6498 32.1328 30.7329C32.1328 30.816 32.2002 30.8833 32.2833 30.8833Z'
+            fill='white'
+          />
+          <path
+            id='Vector_28'
+            d='M33.6495 31.7576C33.7326 31.7576 33.8 31.6902 33.8 31.6071C33.8 31.524 33.7326 31.4566 33.6495 31.4566C33.5664 31.4566 33.4991 31.524 33.4991 31.6071C33.4991 31.6902 33.5664 31.7576 33.6495 31.7576Z'
+            fill='white'
+          />
+          <path
+            id='Vector_29'
+            d='M33.8742 29.3732C33.9573 29.3732 34.0246 29.3058 34.0246 29.2227C34.0246 29.1396 33.9573 29.0723 33.8742 29.0723C33.7911 29.0723 33.7237 29.1396 33.7237 29.2227C33.7237 29.3058 33.7911 29.3732 33.8742 29.3732Z'
+            fill='white'
+          />
+          <path
+            id='Vector_30'
+            d='M13.9414 25.9976C14.0245 25.9976 14.0919 25.9302 14.0919 25.8471C14.0919 25.764 14.0245 25.6966 13.9414 25.6966C13.8583 25.6966 13.791 25.764 13.791 25.8471C13.791 25.9302 13.8583 25.9976 13.9414 25.9976Z'
+            fill='white'
+          />
+          <path
+            id='Vector_31'
+            d='M13.9986 29.504C14.1096 29.504 14.1995 29.4141 14.1995 29.3031C14.1995 29.1921 14.1096 29.1022 13.9986 29.1022C13.8876 29.1022 13.7977 29.1921 13.7977 29.3031C13.7977 29.4141 13.8876 29.504 13.9986 29.504Z'
+            fill='white'
+          />
+          <path
+            id='Vector_32'
+            d='M15.2042 32.0491C15.3151 32.0491 15.4051 31.9592 15.4051 31.8482C15.4051 31.7372 15.3151 31.6473 15.2042 31.6473C15.0932 31.6473 15.0032 31.7372 15.0032 31.8482C15.0032 31.9592 15.0932 32.0491 15.2042 32.0491Z'
+            fill='white'
+          />
+          <path
+            id='Vector_33'
+            d='M29.6443 29.3969C29.7553 29.3969 29.8453 29.3069 29.8453 29.1959C29.8453 29.085 29.7553 28.995 29.6443 28.995C29.5334 28.995 29.4434 29.085 29.4434 29.1959C29.4434 29.3069 29.5334 29.3969 29.6443 29.3969Z'
+            fill='white'
+          />
+          <path
+            id='Vector_34'
+            d='M34.8418 29.1022C34.9527 29.1022 35.0427 29.0122 35.0427 28.9012C35.0427 28.7903 34.9527 28.7003 34.8418 28.7003C34.7308 28.7003 34.6408 28.7903 34.6408 28.9012C34.6408 29.0122 34.7308 29.1022 34.8418 29.1022Z'
+            fill='white'
+          />
+          <path
+            id='Vector_35'
+            d='M32.2698 28.0037C32.3808 28.0037 32.4708 27.9138 32.4708 27.8028C32.4708 27.6918 32.3808 27.6019 32.2698 27.6019C32.1589 27.6019 32.0689 27.6918 32.0689 27.8028C32.0689 27.9138 32.1589 28.0037 32.2698 28.0037Z'
+            fill='white'
+          />
+          <path
+            id='Vector_36'
+            d='M29.6443 28.1109C29.7553 28.1109 29.8453 28.0209 29.8453 27.91C29.8453 27.799 29.7553 27.709 29.6443 27.709C29.5334 27.709 29.4434 27.799 29.4434 27.91C29.4434 28.0209 29.5334 28.1109 29.6443 28.1109Z'
+            fill='white'
+          />
+          <path
+            id='Vector_37'
+            d='M24.2286 7.40973L24.7282 7.36196L24.2295 7.33383C24.2139 7.23738 24.1366 7.16192 24.0393 7.14942L23.9915 6.652L23.9629 7.15344C23.8727 7.17353 23.8035 7.24899 23.7924 7.34276L23.2815 7.38919L23.7959 7.41688C23.8147 7.50306 23.8843 7.57048 23.9719 7.58655L24.0183 8.09915L24.0455 7.58745C24.138 7.57182 24.2112 7.50082 24.2286 7.40973Z'
+            fill='white'
+          />
+          <path
+            id='Vector_38'
+            d='M15.7958 12.9724L16.2954 12.9246L15.7967 12.8965C15.7815 12.8 15.7038 12.7246 15.6065 12.7121L15.5587 12.2147L15.5306 12.7161C15.4399 12.7362 15.3707 12.8116 15.3595 12.9054L14.8487 12.9518L15.3631 12.9795C15.3819 13.0657 15.4515 13.1331 15.539 13.1492L15.5855 13.6618L15.6132 13.1501C15.7056 13.1349 15.7788 13.0635 15.7958 12.9724Z'
+            fill='white'
+          />
+          <path
+            id='Vector_39'
+            d='M34.4756 27.6796L34.9753 27.6318L34.4765 27.6037C34.4613 27.5072 34.3836 27.4318 34.2863 27.4193L34.2385 26.9219L34.2104 27.4233C34.1202 27.4434 34.051 27.5188 34.0398 27.6126L33.529 27.6591L34.0434 27.6867C34.0621 27.7729 34.1318 27.8403 34.2193 27.8564L34.2658 28.369L34.2934 27.8573C34.385 27.8421 34.4582 27.7711 34.4756 27.6796Z'
+            fill='white'
+          />
+          <path
+            id='Vector_40'
+            d='M14.108 35.3694L14.6076 35.3216L14.1089 35.2935C14.0933 35.197 14.016 35.1216 13.9187 35.1091L13.8709 34.6121L13.8428 35.1131C13.7521 35.1332 13.6829 35.2086 13.6717 35.3024L13.1609 35.3489L13.6753 35.3765C13.6941 35.4627 13.7637 35.5306 13.8512 35.5462L13.8977 36.0588L13.9254 35.5471C14.0173 35.5319 14.091 35.4605 14.108 35.3694Z'
+            fill='white'
+          />
+          <path
+            id='Vector_41'
+            d='M32.8883 31.6187L33.3879 31.571L32.8892 31.5428C32.874 31.4464 32.7963 31.3709 32.699 31.3584L32.6512 30.861L32.623 31.362C32.5329 31.3821 32.4636 31.4575 32.4525 31.5513L31.9417 31.5978L32.4561 31.6254C32.4748 31.7116 32.5445 31.779 32.632 31.7951L32.6784 32.3077L32.7061 31.796C32.7976 31.7813 32.8713 31.7098 32.8883 31.6187Z'
+            fill='white'
+          />
+          <path
+            id='Vector_42'
+            d='M24.6117 17.7228C22.5278 18.5328 20.4953 19.2557 18.7803 19.7924C15.2953 20.8837 5.76 23.8378 0 27.5617L0.482232 27.7492C3.99181 25.7667 6.27304 25.1438 8.46586 24.454C10.8502 23.7038 18.5584 21.8999 22.0487 20.9176C23.228 20.5859 24.609 20.1514 26.0718 19.6227C25.7316 19.1481 25.3726 18.6721 24.9948 18.197C24.8685 18.0367 24.7403 17.8787 24.6117 17.7228ZM27.1577 21.232C26.6532 21.5726 26.2303 21.8446 25.9343 22.016C24.2197 23.0073 15.8605 28.7137 13.9588 30.0265C12.0571 31.3392 6.77894 36.3223 5.22508 37.769L5.1715 38.3579C10.1814 33.8571 11.7531 32.7471 13.7445 31.232C16.2093 29.3567 21.308 25.8873 23.0409 24.7755C24.6974 23.7128 26.1915 22.7354 27.5323 21.841C27.5105 21.8044 27.4886 21.7678 27.4667 21.7307C27.3658 21.5651 27.2627 21.399 27.1577 21.232ZM34.9891 12.9608C32.5485 14.3914 28.7018 16.1181 24.9698 17.5831C25.0591 17.6925 25.148 17.8027 25.2364 17.9139C25.6534 18.439 26.0468 18.9677 26.417 19.4968C29.3505 18.4163 32.5694 16.966 35.1235 15.2107C33.9067 16.3636 29.8841 19.37 27.4314 21.0458C27.5578 21.2516 27.6801 21.4574 27.7985 21.6624C31.5143 19.1758 34.0148 17.3455 35.4718 16.1216C37.4811 14.4338 42.0623 10.6563 43.8037 5.59288C40.7491 9.47798 37.1377 11.7012 34.9891 12.9608Z'
+            fill='#E54D2F'
+          />
+          <path
+            id='Vector_43'
+            d='M18.0551 26.4539C17.66 25.9565 17.1134 25.2903 16.7031 24.7737C16.1543 24.0829 15.6467 23.385 15.1814 22.688C15.0296 22.726 14.8782 22.7639 14.7268 22.8019C15.2886 23.6784 15.9123 24.5536 16.5919 25.4091C17.0884 26.0342 17.5399 26.5374 17.7712 26.8504C17.818 26.9138 17.9109 27.054 18.0364 27.2407C18.1811 27.1424 18.3271 27.0433 18.4744 26.9433C18.332 26.7884 18.1913 26.6254 18.0551 26.4539ZM20.9396 29.0723C20.615 28.7651 19.8278 28.252 19.0084 27.4822C18.8276 27.6064 18.645 27.7323 18.4619 27.8591C18.991 28.6048 19.7117 29.5206 20.2761 29.7876C21.1262 30.1903 21.3553 29.4661 20.9396 29.0723ZM25.2364 17.9139C20.5516 12.0173 14.8286 8.77785 12.3612 10.7385C10.4448 12.2611 11.2315 16.711 13.8731 21.3856C14.0097 21.3387 14.145 21.2927 14.279 21.2471C11.6129 16.6927 10.8833 12.4602 12.6907 11.0238C14.9621 9.219 20.4467 12.4709 24.9957 18.1966C25.9374 19.3816 26.7652 20.5711 27.4663 21.7307C30.1507 26.1735 30.9745 30.1912 29.1197 31.8313C28.5522 32.3331 26.8179 32.5301 24.5461 31.5075C24.5144 31.5473 24.5653 31.6549 24.605 31.6812C26.5661 32.4698 28.4446 32.7703 29.393 32.017C31.6719 30.206 29.9212 23.8106 25.2364 17.9139Z'
+            fill='white'
+          />
+          <path
+            id='Vector_44'
+            d='M5.14426 18.6136H8.14482L10.6631 22.8867C10.6631 22.8867 10.6631 19.7924 10.6631 19.5513C10.6631 19.1762 10.1876 18.6873 10.0202 18.6136C10.2211 18.6136 11.9759 18.6136 12.0964 18.6136C11.9692 18.6471 11.5606 19.1427 11.5606 19.5513C11.5606 19.7522 11.5606 24.2397 11.5606 24.454C11.5606 24.7554 11.996 25.1706 12.2036 25.3314H9.31021L6.7517 21.0382C6.7517 21.0382 6.7517 24.2397 6.7517 24.4138C6.7517 24.7487 7.07989 25.0702 7.42147 25.3448H5.21124C5.52603 25.2108 5.82742 24.7889 5.85421 24.454C5.881 24.1191 5.85421 19.7991 5.85421 19.6116C5.85421 19.203 5.45905 18.8681 5.14426 18.6136Z'
+            fill='white'
+          />
+          <path
+            id='Vector_45'
+            d='M32.5913 25.3314H36.5831C36.3621 25.2778 36.1143 25.0166 35.9804 24.6683C35.8464 24.32 33.7299 18.6136 33.7299 18.6136H32.2122C31.7818 18.9235 31.3206 19.2503 30.8281 19.5946C30.8267 19.6071 30.8254 19.6196 30.8231 19.6317C30.7571 20.0335 29.5693 24.3352 29.497 24.5478C29.3965 24.8425 28.8808 25.1706 28.6732 25.3448H30.8231C30.6088 25.1037 30.4347 24.8692 30.4749 24.6013C30.515 24.3334 30.6356 23.7976 30.6356 23.7976H32.8592C32.9597 24.0655 33.0347 24.3062 33.0736 24.5344C33.1204 24.809 32.8391 25.1171 32.5913 25.3314ZM30.8365 22.9403L31.5867 20.489L32.5779 22.9403H30.8365ZM30.4985 18.8583C30.6088 18.777 30.7196 18.6953 30.8298 18.6136H30.2471C30.3052 18.6672 30.4012 18.7516 30.4985 18.8583Z'
+            fill='white'
+          />
+          <path
+            id='Vector_46'
+            d='M15.231 24.6013C15.2711 24.3334 15.3917 23.7976 15.3917 23.7976H17.6153C17.7158 24.0655 17.7908 24.3062 17.8297 24.5344C17.8765 24.809 17.5952 25.1171 17.3474 25.3314H20.8619C20.9351 25.2823 21.0079 25.2332 21.0807 25.1845C20.9445 25.0639 20.819 24.8831 20.7364 24.6683C20.6025 24.32 18.486 18.6136 18.486 18.6136H15.0032C15.1707 18.7677 15.6529 19.1829 15.5792 19.6317C15.5136 20.0335 14.3254 24.3352 14.2531 24.5478C14.1526 24.8425 13.6369 25.1706 13.4293 25.3448H15.5792C15.3649 25.1037 15.1908 24.8692 15.231 24.6013ZM16.3428 20.489L17.334 22.9403H15.5926L16.3428 20.489Z'
+            fill='white'
+          />
+          <path
+            id='Vector_47'
+            d='M27.3712 21.9482C26.7157 22.3848 26.024 22.8407 25.2953 23.3167C25.6222 23.4752 25.8825 23.6744 25.9075 23.9316C25.9539 24.4147 24.9832 24.6482 24.1058 24.5477C23.9303 24.5276 23.758 24.4817 23.5937 24.42C23.4115 24.5375 23.2275 24.6558 23.0409 24.7755C22.8511 24.8974 22.6207 25.0474 22.3577 25.2206V25.9141C22.5319 25.5725 22.9127 25.2666 23.2083 25.251C23.3356 25.2443 23.7776 25.6529 25.5994 25.5524C26.4835 25.5037 28.1914 24.5611 28.1646 23.4761C28.1485 22.8349 27.8136 22.3348 27.3712 21.9482ZM22.3573 23.6235V24.3298C22.5185 24.2222 22.6774 24.1164 22.8333 24.0133C22.5881 23.8427 22.4144 23.6833 22.3573 23.6235ZM26.7483 21.5048C26.5786 21.4043 26.4067 21.3163 26.2419 21.2386C25.3846 20.8368 24.4871 20.7631 24.2996 20.2206C24.1674 19.8379 24.5407 19.4839 25.4516 19.4972C26.3625 19.5106 27.2064 20.0532 27.4341 20.2474V18.5194C27.3671 18.5864 27.0733 18.9235 26.8045 18.8677C26.2888 18.7605 25.4114 18.6207 24.4068 18.6265C23.2548 18.6332 22.2635 19.5236 22.23 20.6492C22.1831 22.2232 23.4423 22.6519 24.1523 22.8997C24.2255 22.9251 24.309 22.9524 24.3996 22.9814C25.0805 22.5384 25.619 22.1973 25.9343 22.0156C26.1459 21.8937 26.4232 21.7186 26.7483 21.5048Z'
+            fill='white'
+          />
+        </g>
       </g>
     </svg>
   );
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 72a64ca73..fd916ac61 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Icon } from '@trussworks/react-uswds';
 //TO DO: need to move NasaLogoColor outside of component and pass down as props
-import NasaLogoColor from '../../nasa-logo-color.js';
+import NasaLogoColor from '../../common/nasa-logo-color';
 import {
   USWDSFooter,
   USWDSFooterNav,
@@ -82,7 +82,7 @@ export default function PageFooter({
           <div id='footer_secondary_container' className='grid-row'>
             <div id='logo-container'>
               <a id='logo-container-link' href='#'>
-                {NasaLogoColor()}
+                <NasaLogoColor />
                 <span className='footer-text'>
                   NASA EarthData 2024 • v0.17.0
                   {/* {version} */}
diff --git a/app/scripts/components/common/page-header/logo-container/styles.scss b/app/scripts/components/common/page-header/logo-container/styles.scss
index 326450eec..cc4386655 100644
--- a/app/scripts/components/common/page-header/logo-container/styles.scss
+++ b/app/scripts/components/common/page-header/logo-container/styles.scss
@@ -4,6 +4,7 @@
   display: flex;
   font-family: themeVars.$veda-uswds-basefont-sans;
   gap: themeVars.$veda-uswds-spacing-105;
+  max-height: 2.5rem;
 
   #logo-container-link {
     display: flex;
@@ -13,25 +14,12 @@
     font-size: themeVars.$veda-uswds-fontsize-lg;
   }
 
-  #nasa-logo-pos {
-    opacity: 1;
-    transform: translate(0, -100%);
-    /* TODO: Fix the svg to not require any styles!
-     * - set opacity to 1 in svg and fix translation
-     */
-  }
-
   @media (width <= themeVars.$veda-uswds-spacing-desktop) {
-    #nasa-logo-pos {
+    svg {
       display: none;
     }
   }
 
-  svg {
-    height: 2.5rem;
-    width: auto;
-  }
-
   #logo-container-beta-tag {
     color: white;
     align-self: center;
diff --git a/app/scripts/components/nasa-logo-color.js b/app/scripts/components/nasa-logo-color.js
deleted file mode 100644
index b85ff9b3b..000000000
--- a/app/scripts/components/nasa-logo-color.js
+++ /dev/null
@@ -1,217 +0,0 @@
-import React from 'react';
-
-export default function NasaLogoColor() {
-  return (
-    <svg
-      width={312}
-      height={258}
-      viewBox='0 0 312 258'
-      style={{
-        fillRule: 'evenodd',
-        clipRule: 'evenodd',
-        strokeLinejoin: 'round',
-        strokeMiterlimit: 2
-      }}
-    >
-      <title>NASA</title>
-      <g id='nasa-logo-pos'>
-        <path
-          d='M273.427,387C273.427,457.761 215.188,516 144.427,516C73.665,516 15.427,457.761 15.427,387C15.427,316.239 73.665,258 144.427,258C215.188,258 273.427,316.239 273.427,387Z'
-          style={{ fill: 'rgb(0,102,179)', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M146.205,269.721C146.205,270.297 145.731,270.771 145.154,270.771C144.578,270.771 144.104,270.297 144.104,269.721C144.104,269.145 144.578,268.67 145.154,268.67C145.731,268.67 146.205,269.145 146.205,269.721Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M153.48,285.643C153.48,286.353 152.896,286.936 152.187,286.936C151.477,286.936 150.893,286.353 150.893,285.643C150.893,284.934 151.477,284.35 152.187,284.35C152.896,284.35 153.48,284.934 153.48,285.643Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M172.393,311.67C172.393,312.379 171.81,312.963 171.1,312.963C170.39,312.963 169.807,312.379 169.807,311.67C169.807,310.959 170.39,310.376 171.1,310.376C171.81,310.376 172.393,310.959 172.393,311.67Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M142.002,294.615C142.002,295.191 141.528,295.666 140.951,295.666C140.375,295.666 139.901,295.191 139.901,294.615C139.901,294.039 140.375,293.564 140.951,293.564C141.528,293.564 142.002,294.039 142.002,294.615Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M153.318,300.596C153.318,301.172 152.843,301.647 152.267,301.647C151.691,301.647 151.217,301.172 151.217,300.596C151.217,300.02 151.691,299.545 152.267,299.545C152.843,299.545 153.318,300.02 153.318,300.596Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M138.607,283.865C138.607,284.574 138.023,285.158 137.314,285.158C136.604,285.158 136.021,284.574 136.021,283.865C136.021,283.156 136.604,282.572 137.314,282.572C138.023,282.572 138.607,283.156 138.607,283.865Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M121.472,294.292C121.472,294.869 120.998,295.343 120.422,295.343C119.845,295.343 119.371,294.869 119.371,294.292C119.371,293.716 119.845,293.241 120.422,293.241C120.998,293.241 121.472,293.716 121.472,294.292Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M124.544,296.394C124.544,296.97 124.069,297.444 123.493,297.444C122.917,297.444 122.442,296.97 122.442,296.394C122.442,295.817 122.917,295.343 123.493,295.343C124.069,295.343 124.544,295.817 124.544,296.394Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M127.615,298.495C127.615,299.071 127.14,299.545 126.564,299.545C125.987,299.545 125.513,299.071 125.513,298.495C125.513,297.918 125.987,297.444 126.564,297.444C127.14,297.444 127.615,297.918 127.615,298.495Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M122.927,302.536C122.927,303.112 122.453,303.587 121.877,303.587C121.3,303.587 120.826,303.112 120.826,302.536C120.826,301.959 121.3,301.485 121.877,301.485C122.453,301.485 122.927,301.959 122.927,302.536Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M98.517,319.671C98.517,320.248 98.043,320.722 97.466,320.722C96.89,320.722 96.415,320.248 96.415,319.671C96.415,319.095 96.89,318.621 97.466,318.621C98.043,318.621 98.517,319.095 98.517,319.671Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M103.044,325.168C103.044,325.744 102.569,326.218 101.993,326.218C101.417,326.218 100.942,325.744 100.942,325.168C100.942,324.591 101.417,324.117 101.993,324.117C102.569,324.117 103.044,324.591 103.044,325.168Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M99.487,413.915C99.487,414.491 99.012,414.966 98.436,414.966C97.86,414.966 97.385,414.491 97.385,413.915C97.385,413.339 97.86,412.864 98.436,412.864C99.012,412.864 99.487,413.339 99.487,413.915Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M100.134,438.404C100.134,439.115 99.549,439.699 98.84,439.699C98.131,439.699 97.547,439.115 97.547,438.404C97.547,437.696 98.131,437.113 98.84,437.113C99.549,437.113 100.134,437.696 100.134,438.404Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M86.231,450.935C86.231,451.511 85.756,451.986 85.18,451.986C84.604,451.986 84.13,451.511 84.13,450.935C84.13,450.357 84.604,449.884 85.18,449.884C85.756,449.884 86.231,450.357 86.231,450.935Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M69.58,456.027C69.58,456.736 68.996,457.32 68.287,457.32C67.578,457.32 66.994,456.736 66.994,456.027C66.994,455.316 67.578,454.732 68.287,454.732C68.996,454.732 69.58,455.316 69.58,456.027Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M66.186,444.71C66.186,445.419 65.602,446.003 64.893,446.003C64.183,446.003 63.599,445.419 63.599,444.71C63.599,444.001 64.183,443.417 64.893,443.417C65.602,443.417 66.186,444.001 66.186,444.71Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M64.246,451.904C64.246,452.48 63.772,452.954 63.195,452.954C62.619,452.954 62.145,452.48 62.145,451.904C62.145,451.327 62.619,450.853 63.195,450.853C63.772,450.853 64.246,451.327 64.246,451.904Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M51.798,445.923C51.798,446.499 51.324,446.974 50.747,446.974C50.171,446.974 49.697,446.499 49.697,445.923C49.697,445.347 50.171,444.872 50.747,444.872C51.324,444.872 51.798,445.347 51.798,445.923Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M95.283,466.129C95.283,466.705 94.809,467.18 94.233,467.18C93.656,467.18 93.182,466.705 93.182,466.129C93.182,465.553 93.656,465.078 94.233,465.078C94.809,465.078 95.283,465.553 95.283,466.129Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M108.378,456.511C108.378,457.22 107.794,457.804 107.085,457.804C106.376,457.804 105.792,457.22 105.792,456.511C105.792,455.802 106.376,455.218 107.085,455.218C107.794,455.218 108.378,455.802 108.378,456.511Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M109.833,468.877C109.833,469.453 109.359,469.928 108.782,469.928C108.206,469.928 107.731,469.453 107.731,468.877C107.731,468.301 108.206,467.828 108.782,467.828C109.359,467.828 109.833,468.301 109.833,468.877Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M163.664,457.077C163.664,457.654 163.19,458.128 162.613,458.128C162.037,458.128 161.563,457.654 161.563,457.077C161.563,456.499 162.037,456.027 162.613,456.027C163.19,456.027 163.664,456.499 163.664,457.077Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M138.607,465.967C138.607,466.545 138.132,467.018 137.556,467.018C136.98,467.018 136.506,466.545 136.506,465.967C136.506,465.391 136.98,464.918 137.556,464.918C138.132,464.918 138.607,465.391 138.607,465.967Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M206.017,478.739C206.017,479.315 205.543,479.789 204.966,479.789C204.39,479.789 203.915,479.315 203.915,478.739C203.915,478.162 204.39,477.688 204.966,477.688C205.543,477.688 206.017,478.162 206.017,478.739Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M211.513,429.029C211.513,429.738 210.929,430.322 210.22,430.322C209.511,430.322 208.927,429.738 208.927,429.029C208.927,428.321 209.511,427.737 210.22,427.737C210.929,427.737 211.513,428.321 211.513,429.029Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M201.167,436.061C201.167,436.639 200.693,437.113 200.116,437.113C199.54,437.113 199.066,436.639 199.066,436.061C199.066,435.487 199.54,435.012 200.116,435.012C200.693,435.012 201.167,435.487 201.167,436.061Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M211.352,438.082C211.352,438.791 210.768,439.375 210.059,439.375C209.35,439.375 208.766,438.791 208.766,438.082C208.766,437.373 209.35,436.789 210.059,436.789C210.768,436.789 211.352,437.373 211.352,438.082Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M201.167,450.611C201.167,451.187 200.693,451.661 200.116,451.661C199.54,451.661 199.066,451.187 199.066,450.611C199.066,450.034 199.54,449.56 200.116,449.56C200.693,449.56 201.167,450.034 201.167,450.611Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M227.517,421.998C227.517,422.574 227.043,423.049 226.467,423.049C225.889,423.049 225.414,422.574 225.414,421.998C225.414,421.422 225.889,420.947 226.467,420.947C227.043,420.947 227.517,421.422 227.517,421.998Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M230.104,428.383C230.104,429.094 229.52,429.676 228.811,429.676C228.101,429.676 227.517,429.094 227.517,428.383C227.517,427.674 228.101,427.09 228.811,427.09C229.52,427.09 230.104,427.674 230.104,428.383Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M248.209,435.981C248.209,436.69 247.625,437.274 246.915,437.274C246.205,437.274 245.621,436.69 245.621,435.981C245.621,435.272 246.205,434.688 246.915,434.688C247.625,434.688 248.209,435.272 248.209,435.981Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M229.781,449.48C229.781,450.056 229.306,450.53 228.73,450.53C228.154,450.53 227.679,450.056 227.679,449.48C227.679,448.904 228.154,448.429 228.73,448.429C229.306,448.429 229.781,448.904 229.781,449.48Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M241.419,438.487C241.419,439.063 240.945,439.537 240.368,439.537C239.792,439.537 239.318,439.063 239.318,438.487C239.318,437.91 239.792,437.436 240.368,437.436C240.945,437.436 241.419,437.91 241.419,438.487Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M239.318,455.46C239.318,456.036 238.843,456.511 238.267,456.511C237.691,456.511 237.216,456.036 237.216,455.46C237.216,454.884 237.691,454.409 238.267,454.409C238.843,454.409 239.318,454.884 239.318,455.46Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M168.848,282.647C169.026,281.99 169.558,281.478 170.227,281.329L170.594,278.562L171.137,281.355C171.785,281.54 172.287,282.07 172.434,282.733L175.235,283.13L172.408,283.628C172.23,284.267 171.717,284.765 171.07,284.923L170.594,287.77L170.114,284.902C169.485,284.72 168.993,284.21 168.837,283.569L166.135,283.13L168.848,282.647Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M96.37,480.946C96.548,480.289 97.081,479.776 97.749,479.627L98.117,476.862L98.661,479.655C99.308,479.838 99.811,480.367 99.956,481.031L102.758,481.428L99.931,481.926C99.753,482.565 99.239,483.063 98.592,483.221L98.117,486.07L97.637,483.201C97.007,483.018 96.516,482.508 96.359,481.867L93.657,481.428L96.37,480.946Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M229.659,455.38C229.837,454.722 230.368,454.21 231.037,454.062L231.405,451.294L231.949,454.087C232.596,454.271 233.099,454.802 233.244,455.466L236.045,455.863L233.219,456.361C233.04,456.999 232.528,457.497 231.88,457.655L231.405,460.503L230.925,457.634C230.295,457.452 229.805,456.941 229.648,456.302L226.947,455.863L229.659,455.38Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M240.211,426.869C240.388,426.211 240.92,425.699 241.588,425.551L241.956,422.783L242.5,425.576C243.148,425.762 243.651,426.291 243.796,426.955L246.597,427.352L243.771,427.85C243.592,428.488 243.079,428.987 242.433,429.145L241.956,431.992L241.477,429.123C240.847,428.942 240.357,428.432 240.2,427.791L237.497,427.352L240.211,426.869Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M109.303,321.556C109.481,320.898 110.013,320.387 110.681,320.237L111.049,317.471L111.593,320.264C112.241,320.448 112.743,320.978 112.889,321.642L115.69,322.039L112.863,322.536C112.685,323.175 112.172,323.674 111.525,323.832L111.049,326.679L110.569,323.811C109.94,323.628 109.449,323.118 109.293,322.478L106.59,322.039L109.303,321.556Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M100.756,381.578C110.286,398.228 121.393,410.411 130.341,421.988C138.283,432.264 153.757,437.408 148.307,442.286C142.164,447.782 127.292,423.533 127.292,423.533C117.408,411.614 107.949,398.97 98.299,382.433L100.756,381.578Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M0,425.268C46.046,395.026 126.409,375.502 192.597,349.225C242.884,329.26 287.601,304.198 311.639,269.689C250.721,393.777 81.066,379.089 3.312,426.424L0,425.268Z'
-          style={{ fill: 'rgb(237,28,36)', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M107.05,363.738L130.11,363.738L146.644,405.374L152.155,410.905L122.134,410.905L127.645,405.374L125.687,400.294L109.117,400.294L107.413,406.103L111.365,410.905L95.701,410.905L101.213,405.374L111.837,368.554L107.05,363.738ZM122.751,393.004L116.078,376.098L111.184,393.004L122.751,393.004Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M214.184,363.738L238.118,363.738L254.653,405.374L260.164,410.905L230.143,410.905L235.654,405.374L233.696,400.294L217.125,400.294L215.421,406.103L219.373,410.905L203.71,410.905L209.222,405.374L219.845,368.554L214.184,363.738ZM230.759,393.004L224.087,376.098L219.192,393.004L230.759,393.004Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M75.758,393.113L75.758,368.554L70.972,363.738L86.925,363.738L82.14,368.554L82.14,405.374L87.651,410.905L66.693,410.905L48.637,380.361L48.637,405.374L53.277,410.905L36.6,410.905L42.111,405.374L42.111,368.554L37.325,363.738L58.21,363.738L75.758,393.113Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M196.553,375.835L196.063,361.15L191.12,364.562C184.156,362.127 176.051,362.219 170.364,364.91C165.071,367.415 159.36,372.704 160.055,380.22C160.752,387.736 166.577,390.645 171.826,393.024C178.582,396.086 185.936,397.121 185.827,401.167C185.757,403.741 181.485,405.587 178.165,405.482C175.135,405.386 165.28,404.646 160.125,398.523L161.101,413.97L166.604,409.935C173.289,412.3 181.392,413.292 188.889,410.847C196.341,408.419 204.174,402.183 199.827,391.285C197.956,386.596 192.804,383.705 189.731,382.447C186.917,381.295 178.333,377.92 175.936,376.671C173.136,375.212 173.448,370.582 180.185,369.642C186.288,368.791 194.742,373.678 196.553,375.835Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M35.658,497.677C128.131,403.298 265.971,359.693 311.639,269.689C284.138,357.193 136.85,405.454 35.408,502.115L35.658,497.677Z'
-          style={{ fill: 'rgb(237,28,36)', fillRule: 'nonzero' }}
-        />
-        <path
-          d='M98.299,382.433C97.216,380.577 96.131,378.672 95.042,376.714C70.388,332.361 73.944,287.098 118.563,306.82C156.431,323.559 192.6,370.511 207.146,403.857C213.887,419.307 231.96,479.946 173.764,455.374L173.65,455.019C228.613,477.651 219.111,420.301 189.691,376.331C173.042,351.45 151.331,330.725 137.637,320.722C92.05,287.421 64.246,307.79 96.253,373.097C97.702,376.053 99.208,378.875 100.756,381.578L98.299,382.433Z'
-          style={{ fill: 'white', fillRule: 'nonzero' }}
-        />
-      </g>
-    </svg>
-  );
-}

From 0755ef6e515b007209dfa8a6aa927c16b9c5e31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 12 Dec 2024 11:13:19 +0100
Subject: [PATCH 21/35] Pass svg logo as prop to footer

---
 app/scripts/components/common/layout-root/index.tsx | 2 ++
 app/scripts/components/common/page-footer/index.tsx | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 50c32547d..3c0749817 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -15,6 +15,7 @@ import { getBannerFromVedaConfig, getCookieConsentFromVedaConfig } from 'veda';
 import MetaTags from '../meta-tags';
 import PageFooter from '../page-footer';
 import PageFooterLegacy from '../page-footer-legacy';
+import NasaLogoColor from '../nasa-logo-color';
 
 const Banner = React.lazy(() => import('../banner'));
 const CookieConsent = React.lazy(() => import('../cookie-consent'));
@@ -115,6 +116,7 @@ function LayoutRoot(props: { children?: ReactNode }) {
             footerPrimaryNavItems
           }}
           hideFooter={hideFooter}
+          logoSvg={<NasaLogoColor />}
         />
       ) : (
         <PageFooterLegacy hideFooter={hideFooter} />
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index fd916ac61..42752a600 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { Icon } from '@trussworks/react-uswds';
-//TO DO: need to move NasaLogoColor outside of component and pass down as props
-import NasaLogoColor from '../../common/nasa-logo-color';
+
 import {
   USWDSFooter,
   USWDSFooterNav,
@@ -13,13 +12,15 @@ interface PageFooterProps {
   primarySection: any;
   settings: any;
   hideFooter?: boolean;
+  logoSvg?: SVGElement | JSX.Element;
 }
 //TODO: clean up PageFooterProps, Unexpected any. Specify a different interface.
 
 export default function PageFooter({
   settings,
   primarySection,
-  hideFooter
+  hideFooter,
+  logoSvg
 }: PageFooterProps) {
   const returnToTopButton = () => {
     return (
@@ -82,7 +83,7 @@ export default function PageFooter({
           <div id='footer_secondary_container' className='grid-row'>
             <div id='logo-container'>
               <a id='logo-container-link' href='#'>
-                <NasaLogoColor />
+                <>{logoSvg}</>
                 <span className='footer-text'>
                   NASA EarthData 2024 • v0.17.0
                   {/* {version} */}

From 2d175f17c3223fad3e69e14a86b28681c34a1f0a Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Thu, 12 Dec 2024 15:58:39 -0500
Subject: [PATCH 22/35] adding comment in createDynamicNavMenuList

---
 .../common/page-header/nav/create-dynamic-nav-menu-list.tsx      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/scripts/components/common/page-header/nav/create-dynamic-nav-menu-list.tsx b/app/scripts/components/common/page-header/nav/create-dynamic-nav-menu-list.tsx
index 764853687..0acc8b6b0 100644
--- a/app/scripts/components/common/page-header/nav/create-dynamic-nav-menu-list.tsx
+++ b/app/scripts/components/common/page-header/nav/create-dynamic-nav-menu-list.tsx
@@ -12,6 +12,7 @@ export const createDynamicNavMenuList = (
   isOpen?: boolean[],
   setIsOpen?: SetState<boolean[]>
 ): JSX.Element[] => {
+  // @TODO:Need to elevate this functionality to outside of the header. Allow this function to take classname as an argument so we can dynamcally create different types of links across multiple compoenents and apply various visual styling.
   return navItems.map((item, index) => {
     switch (item.type) {
       case NavItemType.DROPDOWN:

From 6bf3149e37111866bf332d996339108c52656c80 Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Thu, 12 Dec 2024 15:58:50 -0500
Subject: [PATCH 23/35] wirign up dynamic link creation

---
 app/scripts/components/common/page-footer/index.tsx  |  6 +++---
 .../common/page-header/nav/nav-item-cta.tsx          | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index c5414710d..98974017a 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -23,7 +23,6 @@ export default function PageFooter({
   primarySection,
   hidefooter
 }: PageFooterProps) {
-  console.log(settings, primarySection, hidefooter);
   const returnToTopButton = () => {
     return (
       <div
@@ -57,7 +56,7 @@ export default function PageFooter({
     return cleanedNavItems.map((item) => {
       switch (item.type) {
         case NavItemType.ACTION:
-          return <NavItemCTA item={item} />;
+          return <NavItemCTA item={item} customClasses={linkClasses} />;
 
         case NavItemType.EXTERNAL_LINK:
           return (
@@ -83,7 +82,8 @@ export default function PageFooter({
     [mainNavItems]
   );
   const secondaryItems = useMemo(
-    () => createNavElement(subNavItems, 'usa-link text-base-dark'),
+    () =>
+      createNavElement(subNavItems, 'usa-link text-base-dark text-underline'),
     [mainNavItems]
   );
   return (
diff --git a/app/scripts/components/common/page-header/nav/nav-item-cta.tsx b/app/scripts/components/common/page-header/nav/nav-item-cta.tsx
index 04efa7798..0703f8855 100644
--- a/app/scripts/components/common/page-header/nav/nav-item-cta.tsx
+++ b/app/scripts/components/common/page-header/nav/nav-item-cta.tsx
@@ -5,10 +5,12 @@ import { ActionNavItem } from '../types';
 
 interface NavItemCTAProps {
   item: ActionNavItem;
+  customClasses?: string;
 }
 
 export const NavItemCTA: React.FC<NavItemCTAProps> = ({
-  item
+  item,
+  customClasses
 }): JSX.Element => {
   const { isRevealed, show, hide } = useFeedbackModal();
   return (
@@ -16,12 +18,16 @@ export const NavItemCTA: React.FC<NavItemCTAProps> = ({
       {item.actionId === 'open-google-form' && (
         <>
           <button
-            className='usa-nav__link'
+            className={
+              customClasses && customClasses != ''
+                ? customClasses
+                : 'usa-nav__link'
+            }
             type='button'
             tabIndex={0}
             id={item.id}
             onClick={show}
-            style={{background: 'none', border: 'none', cursor: 'pointer'}}
+            style={{ background: 'none', border: 'none', cursor: 'pointer' }}
           >
             {item.title}
           </button>

From 886912e6ae6d372753994057d6fa5b685d4fe585 Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Fri, 13 Dec 2024 14:36:01 -0500
Subject: [PATCH 24/35] cleaning up veda.config and styling

---
 .../components/common/layout-root/index.tsx   |  6 +--
 .../components/common/page-footer/index.tsx   | 13 ++---
 .../common/page-header/default-config.ts      | 54 ++-----------------
 mock/veda.config.js                           | 42 ++-------------
 parcel-resolver-veda/index.d.ts               | 18 ++++---
 parcel-resolver-veda/index.js                 |  5 +-
 6 files changed, 25 insertions(+), 113 deletions(-)

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 8fa2f884b..98856584b 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -29,9 +29,7 @@ import Logo from '$components/common/page-header-legacy/logo';
 import {
   mainNavItems,
   subNavItems,
-  footerSettings,
-  footerPrimaryContactItems,
-  footerPrimaryNavItems
+  footerSettings
 } from '$components/common/page-header/default-config';
 import { checkEnvFlag } from '$utils/utils';
 
@@ -112,8 +110,6 @@ function LayoutRoot(props: { children?: ReactNode }) {
         <PageFooter
           settings={footerSettings}
           primarySection={{
-            footerPrimaryContactItems,
-            footerPrimaryNavItems,
             mainNavItems,
             subNavItems
           }}
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index c1645fb50..197ada53a 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
 import { Icon } from '@trussworks/react-uswds';
 //TO DO: need to move NasaLogoColor outside of component and pass down as props
-import { NavItemType } from '../page-header/types.js';
-import { NavItemCTA } from '../page-header/nav/nav-item-cta.js';
+import { NavItemType } from '../page-header/types';
+import { NavItemCTA } from '../page-header/nav/nav-item-cta';
 import {
   USWDSFooter,
   USWDSFooterNav,
@@ -29,7 +29,7 @@ export default function PageFooter({
     return (
       <div
         id='return-to-top-container'
-        className=' margin-left-auto margin-right-auto padding-x-4'
+        className=' margin-left-auto margin-right-auto'
       >
         <a className='usa-link text-primary' href='#'>
           Return to top
@@ -40,12 +40,7 @@ export default function PageFooter({
 
   const { returnToTop, secondarySection } = settings;
   /* eslint-disable */
-  const {
-    footerPrimaryContactItems,
-    footerPrimaryNavItems,
-    mainNavItems,
-    subNavItems
-  } = primarySection;
+  const { mainNavItems, subNavItems } = primarySection;
 
   const createNavElement = (navItems, linkClasses) => {
     //removing 'dropdown' items from array
diff --git a/app/scripts/components/common/page-header/default-config.ts b/app/scripts/components/common/page-header/default-config.ts
index 4f18083ab..051e2c013 100644
--- a/app/scripts/components/common/page-header/default-config.ts
+++ b/app/scripts/components/common/page-header/default-config.ts
@@ -1,7 +1,7 @@
 import {
   getString,
   getNavItemsFromVedaConfig,
-  getFooterItemsFromVedaConfig
+  getFooterSettingsFromVedaConfig
 } from 'veda';
 import {
   InternalNavLink,
@@ -78,42 +78,6 @@ const defaultFooterSettings = {
   returnToTop: true
 };
 
-const defaultFooterPrimaryContactItems = [
-  {
-    title: 'News and Events',
-    to: '/data-catalog',
-    type: 'internalLink'
-  },
-  {
-    title: 'About',
-    to: '/data-catalog',
-    type: 'internalLink'
-  },
-  {
-    title: 'Contact Us',
-    to: '/data-catalog',
-    type: 'internalLink'
-  }
-];
-
-const defaultFooterPrimaryNavItems = [
-  {
-    title: 'Stories',
-    to: '/data-catalog',
-    type: 'internalLink'
-  },
-  {
-    title: 'Topics',
-    to: '/data-catalog',
-    type: 'internalLink'
-  },
-  {
-    title: 'Data Toolkit',
-    to: '/data-catalog',
-    type: 'internalLink'
-  }
-];
-
 if (process.env.GOOGLE_FORM !== undefined) {
   defaultSubNavItems = [
     ...defaultSubNavItems,
@@ -131,18 +95,6 @@ const mainNavItems =
 const subNavItems =
   getNavItemsFromVedaConfig()?.subNavItems ?? defaultSubNavItems;
 const footerSettings =
-  getFooterItemsFromVedaConfig()?.footerSettings ?? defaultFooterSettings;
-const footerPrimaryContactItems =
-  getFooterItemsFromVedaConfig()?.footerPrimaryContactItems ??
-  defaultFooterPrimaryContactItems;
-const footerPrimaryNavItems =
-  getFooterItemsFromVedaConfig()?.footerPrimaryNavItems ??
-  defaultFooterPrimaryNavItems;
+  getFooterSettingsFromVedaConfig() ?? defaultFooterSettings;
 
-export {
-  mainNavItems,
-  subNavItems,
-  footerSettings,
-  footerPrimaryContactItems,
-  footerPrimaryNavItems
-};
+export { mainNavItems, subNavItems, footerSettings };
diff --git a/mock/veda.config.js b/mock/veda.config.js
index 3b9782c5f..80ecfda6c 100644
--- a/mock/veda.config.js
+++ b/mock/veda.config.js
@@ -50,43 +50,10 @@ let mainNavItems = [
     type: 'internalLink'
   }
 ];
-let footerPrimaryNavItems = [
-  {
-    title: 'Data Catalog',
-    to: '/data-catalog',
-    type: 'internalLink'
-  },
-  {
-    title: 'Data Catalog 2',
-    to: '/data-catalog',
-    type: 'internalLink'
-  },
-  {
-    title: 'Data Catalog3',
-    to: '/data-catalog',
-    type: 'internalLink'
-  }
-];
-let footerPrimaryContactItems = [
-  {
-    title: 'News and Events',
-    to: '/data-catalog',
-    type: 'internalLink'
-  },
-  {
-    title: 'About',
-    to: '/data-catalog',
-    type: 'internalLink'
-  },
-  {
-    title: 'Contact Us',
-    to: '/data-catalog',
-    type: 'internalLink'
-  }
-];
 
 let footerSettings = {
   secondarySection: {
+    id: 'stories',
     title: 'email test',
     to: '/data-catalog',
     type: 'Email'
@@ -155,11 +122,8 @@ module.exports = {
     mainNavItems,
     subNavItems
   },
-  footerItems: {
-    footerSettings,
-    footerPrimaryContactItems,
-    footerPrimaryNavItems
-  },
+
+  footerSettings,
   cookieConsentForm: {
     title: 'Cookie Consent',
     copy: 'We use cookies to enhance your browsing experience and to help us understand how our website is used. These cookies allow us to collect data on site usage and improve our services based on your interactions. To learn more about it, see our [Privacy Policy](https://www.nasa.gov/privacy/#cookies)',
diff --git a/parcel-resolver-veda/index.d.ts b/parcel-resolver-veda/index.d.ts
index d048107e5..b81385a26 100644
--- a/parcel-resolver-veda/index.d.ts
+++ b/parcel-resolver-veda/index.d.ts
@@ -293,6 +293,16 @@ declare module 'veda' {
   }
   type NavLinkItem = ExternalNavLink | InternalNavLink;
 
+  interface FooterSettings {
+    secondarySection: {
+      id: string;
+      title: string;
+      href: string;
+      type: 'Email';
+    };
+    returnToTop: boolean;
+  }
+
   export interface DropdownNavLink {
     id: string;
     title: string;
@@ -354,13 +364,9 @@ declare module 'veda' {
       }
     | undefined;
 
-  export const getFooterItemsFromVedaConfig: () =>
+  export const getFooterSettingsFromVedaConfig: () =>
     | {
-        footerSettings: (NavLinkItem | DropdownNavLink)[] | undefined;
-        footerPrimaryContactItems:
-          | (NavLinkItem | DropdownNavLink)[]
-          | undefined;
-        footerPrimaryNavItems: (NavLinkItem | DropdownNavLink)[] | undefined;
+        footerSettings: FooterSettings;
       }
     | undefined;
 
diff --git a/parcel-resolver-veda/index.js b/parcel-resolver-veda/index.js
index d2d3e5d10..704e283e0 100644
--- a/parcel-resolver-veda/index.js
+++ b/parcel-resolver-veda/index.js
@@ -229,8 +229,7 @@ module.exports = new Resolver({
           banner: ${getBannerContent(result)},
           navItems: ${JSON.stringify(result.navItems)},
           cookieConsentForm: ${getCookieConsentForm(result)},
-          footerItems: ${JSON.stringify(result.footerItems)}
-
+          footerSettings: ${JSON.stringify(result.footerSettings)}
         };
 
         export const theme = ${JSON.stringify(result.theme) || null};
@@ -251,7 +250,7 @@ module.exports = new Resolver({
         export const getBannerFromVedaConfig = () => config.banner;
         export const getNavItemsFromVedaConfig = () => config.navItems;
         export const getCookieConsentFromVedaConfig = () => config.cookieConsentForm;
-        export const getFooterItemsFromVedaConfig = () => config.footerItems
+        export const getFooterSettingsFromVedaConfig = () => config.footerSettings;
 
         export const datasets = ${generateMdxDataObject(datasetsImportData)};
         export const stories = ${generateMdxDataObject(storiesImportData)};

From d830c03920f26dc364106fbc0be238bcaeca7bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Mon, 16 Dec 2024 11:29:02 +0100
Subject: [PATCH 25/35] Add comments to .env

---
 .env | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.env b/.env
index b160b8f44..d7fac58b0 100644
--- a/.env
+++ b/.env
@@ -14,7 +14,9 @@ GOOGLE_FORM = 'https://docs.google.com/forms/d/e/1FAIpQLSfGcd3FDsM3kQIOVKjzdPn4f
 
 SHOW_CONFIGURABLE_COLOR_MAP = 'TRUE'
 
+# Enables the refactor page header component that uses the USWDS design system
 # Enables the refactor page header component that uses the USWDS design system
 ENABLE_USWDS_PAGE_HEADER = 'TRUE'
 # Enables the refactor page footer component that uses the USWDS design system
+# Enables the refactor page footer component that uses the USWDS design system
 ENABLE_USWDS_PAGE_FOOTER = 'TRUE'

From 5089c7ea3452f97ae3dfc0cfacaf7e7f0795f5c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Mon, 16 Dec 2024 11:31:32 +0100
Subject: [PATCH 26/35] Revert "Add comments to .env"

This reverts commit d830c03920f26dc364106fbc0be238bcaeca7bda.
---
 .env | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.env b/.env
index d7fac58b0..b160b8f44 100644
--- a/.env
+++ b/.env
@@ -14,9 +14,7 @@ GOOGLE_FORM = 'https://docs.google.com/forms/d/e/1FAIpQLSfGcd3FDsM3kQIOVKjzdPn4f
 
 SHOW_CONFIGURABLE_COLOR_MAP = 'TRUE'
 
-# Enables the refactor page header component that uses the USWDS design system
 # Enables the refactor page header component that uses the USWDS design system
 ENABLE_USWDS_PAGE_HEADER = 'TRUE'
 # Enables the refactor page footer component that uses the USWDS design system
-# Enables the refactor page footer component that uses the USWDS design system
 ENABLE_USWDS_PAGE_FOOTER = 'TRUE'

From c7846f83884f1d5d91b9d48fe906bdc97fd8d9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Mon, 16 Dec 2024 12:00:03 +0100
Subject: [PATCH 27/35] Remove TODO as completed

---
 app/scripts/components/common/page-footer/index.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 197ada53a..022896288 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,6 +1,5 @@
 import React, { useMemo } from 'react';
 import { Icon } from '@trussworks/react-uswds';
-//TO DO: need to move NasaLogoColor outside of component and pass down as props
 import { NavItemType } from '../page-header/types';
 import { NavItemCTA } from '../page-header/nav/nav-item-cta';
 import {
@@ -29,7 +28,7 @@ export default function PageFooter({
     return (
       <div
         id='return-to-top-container'
-        className=' margin-left-auto margin-right-auto'
+        className='margin-left-auto margin-right-auto'
       >
         <a className='usa-link text-primary' href='#'>
           Return to top
@@ -114,7 +113,7 @@ export default function PageFooter({
           <div id='footer_secondary_container' className='grid-row'>
             <div id='logo-container'>
               <a id='logo-container-link' href='#'>
-                <>{logoSvg}</>
+                {logoSvg as JSX.Element}
                 <span className='footer-text'>
                   NASA EarthData 2024 • v0.17.0
                   {/* {version} */}

From fc7d58e1572eab229198ca537f2666b777f9eddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Mon, 16 Dec 2024 17:21:00 +0100
Subject: [PATCH 28/35] Add page footer to exported components

---
 app/scripts/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/scripts/index.ts b/app/scripts/index.ts
index 45c191248..ea735c5d7 100644
--- a/app/scripts/index.ts
+++ b/app/scripts/index.ts
@@ -17,6 +17,7 @@ import PageHero from '$components/common/page-hero';
 import StoriesHubContent from '$components/stories/hub/hub-content';
 import { useFiltersWithQS } from '$components/common/catalog/controls/hooks/use-filters-with-query';
 import PageHeader from '$components/common/page-header';
+import PageFooter from '$components/common/page-footer';
 import type {
   NavItem,
   InternalNavLink,
@@ -65,6 +66,7 @@ export {
   PageMainContent,
   PageHero,
   PageHeader,
+  PageFooter,
   ReactQueryProvider,
   EnvConfigProvider,
   StoriesHubContent,

From 75f6fd358012b38ad0117cf5eaeb034185108e3b Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Mon, 16 Dec 2024 12:58:22 -0500
Subject: [PATCH 29/35] createing jest tests

---
 .../components/common/layout-root/index.tsx   |  6 +-
 .../common/page-footer/footer.test.tsx        | 75 +++++++++++++++++++
 .../components/common/page-footer/index.tsx   | 19 +++--
 .../common/page-header/default-config.ts      |  1 +
 jest.setup.js                                 |  4 +-
 mock/veda.config.js                           |  2 +-
 parcel-resolver-veda/index.d.ts               | 20 +++--
 7 files changed, 102 insertions(+), 25 deletions(-)
 create mode 100644 app/scripts/components/common/page-footer/footer.test.tsx

diff --git a/app/scripts/components/common/layout-root/index.tsx b/app/scripts/components/common/layout-root/index.tsx
index 98856584b..1a9a52f44 100644
--- a/app/scripts/components/common/layout-root/index.tsx
+++ b/app/scripts/components/common/layout-root/index.tsx
@@ -109,10 +109,8 @@ function LayoutRoot(props: { children?: ReactNode }) {
       {isUSWDSEnabled ? (
         <PageFooter
           settings={footerSettings}
-          primarySection={{
-            mainNavItems,
-            subNavItems
-          }}
+          mainNavItems={mainNavItems}
+          subNavItems={subNavItems}
           hideFooter={hideFooter}
           logoSvg={<NasaLogoColor />}
         />
diff --git a/app/scripts/components/common/page-footer/footer.test.tsx b/app/scripts/components/common/page-footer/footer.test.tsx
new file mode 100644
index 000000000..df7ef19a1
--- /dev/null
+++ b/app/scripts/components/common/page-footer/footer.test.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { navItems, footerSettings } from '../../../../../mock/veda.config.js';
+import NasaLogoColor from '../nasa-logo-color';
+import { NavItem } from '../page-header/types.js';
+import '@testing-library/jest-dom/extend-expect';
+
+import PageFooter from './index';
+
+const mockMainNavItems: NavItem[] = navItems.mainNavItems;
+const mockSubNavItems: NavItem[] = navItems.subNavItems;
+const mockFooterSettings = footerSettings;
+const hideFooter = false;
+
+describe('PageFooter', () => {
+  beforeEach(() => {
+    render(
+      <PageFooter
+        settings={mockFooterSettings}
+        mainNavItems={mockMainNavItems}
+        subNavItems={mockSubNavItems}
+        hideFooter={hideFooter}
+        logoSvg={<NasaLogoColor />}
+      />
+    );
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  test('renders the PageFooter', () => {
+    const footerElement = document.querySelector('footer');
+
+    expect(footerElement).toBeInTheDocument();
+  });
+  test('renders correct buttons and links', () => {
+    expect(screen.getByText('Data Catalog')).toBeInTheDocument();
+    expect(screen.getByText('Exploration')).toBeInTheDocument();
+    expect(screen.getByText('Stories')).toBeInTheDocument();
+
+    expect(screen.getByText('About')).toBeInTheDocument();
+    expect(screen.getByText('Return to top')).toBeInTheDocument();
+  });
+});
+
+describe('PageFooter dynamic functionality', () => {
+  test('Return to top does not show', () => {
+    const updatedMockSettings = { ...mockFooterSettings, returnToTop: false };
+
+    render(
+      <PageFooter
+        settings={updatedMockSettings}
+        mainNavItems={mockMainNavItems}
+        subNavItems={mockSubNavItems}
+        hideFooter={hideFooter}
+        logoSvg={<NasaLogoColor />}
+      />
+    );
+    expect(() => screen.getByText('Return to top')).toThrow();
+  });
+  test('Hide footer should function correctly', () => {
+    const updatedMockSettings = { ...mockFooterSettings, returnToTop: false };
+
+    render(
+      <PageFooter
+        settings={updatedMockSettings}
+        mainNavItems={mockMainNavItems}
+        subNavItems={mockSubNavItems}
+        hideFooter={true}
+        logoSvg={<NasaLogoColor />}
+      />
+    );
+    const footerElement = document.querySelector('footer');
+    expect(footerElement).toBeNull();
+  });
+});
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 022896288..b8f431185 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -1,18 +1,20 @@
 import React, { useMemo } from 'react';
 import { Icon } from '@trussworks/react-uswds';
-import { NavItemType } from '../page-header/types';
+import { DropdownNavLink, FooterSettings, NavLinkItem } from 'veda';
+import { ActionNavItem, NavItemType } from '../page-header/types';
 import { NavItemCTA } from '../page-header/nav/nav-item-cta';
 import {
   USWDSFooter,
   USWDSFooterNav,
   USWDSAddress
 } from '$components/common/uswds';
-
 import './styles.scss';
 
 interface PageFooterProps {
-  primarySection: any;
-  settings: any;
+  //use of NavItem is causing issues with TS and throwing erros in the .
+  mainNavItems: (NavLinkItem | DropdownNavLink | ActionNavItem)[];
+  subNavItems: (NavLinkItem | DropdownNavLink | ActionNavItem)[];
+  settings: FooterSettings;
   hideFooter?: boolean;
   logoSvg?: SVGElement | JSX.Element;
 }
@@ -20,7 +22,8 @@ interface PageFooterProps {
 
 export default function PageFooter({
   settings,
-  primarySection,
+  mainNavItems,
+  subNavItems,
   hideFooter,
   logoSvg
 }: PageFooterProps) {
@@ -39,7 +42,6 @@ export default function PageFooter({
 
   const { returnToTop, secondarySection } = settings;
   /* eslint-disable */
-  const { mainNavItems, subNavItems } = primarySection;
 
   const createNavElement = (navItems, linkClasses) => {
     //removing 'dropdown' items from array
@@ -82,12 +84,13 @@ export default function PageFooter({
       createNavElement(subNavItems, 'usa-link text-base-dark text-underline'),
     [mainNavItems]
   );
-  return (
+  return hideFooter ? (
+    <></>
+  ) : (
     <>
       <USWDSFooter
         size='slim'
         returnToTop={returnToTop && returnToTopButton()}
-        className={hideFooter && 'display-none'}
         primary={
           <div
             id='footer_primary_container'
diff --git a/app/scripts/components/common/page-header/default-config.ts b/app/scripts/components/common/page-header/default-config.ts
index 051e2c013..1007419d2 100644
--- a/app/scripts/components/common/page-header/default-config.ts
+++ b/app/scripts/components/common/page-header/default-config.ts
@@ -71,6 +71,7 @@ let defaultSubNavItems: (
 
 const defaultFooterSettings = {
   secondarySection: {
+    id: 'email test',
     title: 'email test',
     to: '/data-catalog',
     type: 'Email'
diff --git a/jest.setup.js b/jest.setup.js
index d402fb974..e10f6eda1 100644
--- a/jest.setup.js
+++ b/jest.setup.js
@@ -6,6 +6,8 @@ jest.mock('veda', () => ({
     one: variable,
     other: variable
   }),
-  getNavItemsFromVedaConfig: () => []
+  getNavItemsFromVedaConfig: () => [],
+  getFooterSettingsFromVedaConfig: () => []
 }));
+
 export default undefined;
diff --git a/mock/veda.config.js b/mock/veda.config.js
index 80ecfda6c..547b8771b 100644
--- a/mock/veda.config.js
+++ b/mock/veda.config.js
@@ -56,7 +56,7 @@ let footerSettings = {
     id: 'stories',
     title: 'email test',
     to: '/data-catalog',
-    type: 'Email'
+    type: 'email'
   },
   returnToTop: true
 };
diff --git a/parcel-resolver-veda/index.d.ts b/parcel-resolver-veda/index.d.ts
index b81385a26..e30e25906 100644
--- a/parcel-resolver-veda/index.d.ts
+++ b/parcel-resolver-veda/index.d.ts
@@ -292,14 +292,14 @@ declare module 'veda' {
     type: 'externalLink';
   }
   type NavLinkItem = ExternalNavLink | InternalNavLink;
-
-  interface FooterSettings {
-    secondarySection: {
-      id: string;
-      title: string;
-      href: string;
-      type: 'Email';
-    };
+  export interface SecondarySection {
+    id: string;
+    title: string;
+    to: string;
+    type: string;
+  }
+  export interface FooterSettings {
+    secondarySection: SecondarySection;
     returnToTop: boolean;
   }
 
@@ -365,9 +365,7 @@ declare module 'veda' {
     | undefined;
 
   export const getFooterSettingsFromVedaConfig: () =>
-    | {
-        footerSettings: FooterSettings;
-      }
+    | FooterSettings
     | undefined;
 
   /**

From d72afea371aad5f67d332ed1201c5e9ac5f46f9f Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Mon, 16 Dec 2024 15:54:54 -0500
Subject: [PATCH 30/35] correcting test

---
 app/scripts/components/common/page-footer/footer.test.tsx | 4 +++-
 app/scripts/components/common/page-footer/index.tsx       | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/scripts/components/common/page-footer/footer.test.tsx b/app/scripts/components/common/page-footer/footer.test.tsx
index df7ef19a1..06b9baf0b 100644
--- a/app/scripts/components/common/page-footer/footer.test.tsx
+++ b/app/scripts/components/common/page-footer/footer.test.tsx
@@ -31,6 +31,8 @@ describe('PageFooter', () => {
     const footerElement = document.querySelector('footer');
 
     expect(footerElement).toBeInTheDocument();
+    expect(footerElement).not.toHaveClass('display-none');
+
   });
   test('renders correct buttons and links', () => {
     expect(screen.getByText('Data Catalog')).toBeInTheDocument();
@@ -70,6 +72,6 @@ describe('PageFooter dynamic functionality', () => {
       />
     );
     const footerElement = document.querySelector('footer');
-    expect(footerElement).toBeNull();
+    expect(footerElement).toHaveClass('display-none');
   });
 });
diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index b8f431185..76e0ff550 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -84,13 +84,12 @@ export default function PageFooter({
       createNavElement(subNavItems, 'usa-link text-base-dark text-underline'),
     [mainNavItems]
   );
-  return hideFooter ? (
-    <></>
-  ) : (
+  return (
     <>
       <USWDSFooter
         size='slim'
         returnToTop={returnToTop && returnToTopButton()}
+        className={hideFooter && 'display-none'}
         primary={
           <div
             id='footer_primary_container'

From a9fd5cec91af7692ec8c647c0b6ba0db8b70fa86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Tue, 17 Dec 2024 12:11:02 +0100
Subject: [PATCH 31/35] Add secondary footer content to footer config

---
 app/scripts/components/common/page-footer/index.tsx   |  7 +++----
 .../components/common/page-header/default-config.ts   | 10 ++++++----
 mock/veda.config.js                                   | 11 +++++------
 parcel-resolver-veda/index.d.ts                       |  8 +++++++-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index 76e0ff550..eb7503fbe 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -117,13 +117,12 @@ export default function PageFooter({
               <a id='logo-container-link' href='#'>
                 {logoSvg as JSX.Element}
                 <span className='footer-text'>
-                  NASA EarthData 2024 • v0.17.0
-                  {/* {version} */}
+                  {secondarySection.division} • {secondarySection.version}
                 </span>
               </a>
             </div>
             <div className='grid-col-4 footer-text grid-gap-6 flex-justify-end'>
-              <span>NASA Official: </span>
+              <span>{secondarySection.title}: </span>
               <a
                 key={secondarySection.type}
                 href={`mailto:${secondarySection.to}`}
@@ -132,7 +131,7 @@ export default function PageFooter({
                   className='margin-right-1 width-205 height-auto position-relative'
                   id='mail_icon'
                 />
-                {secondarySection.title}
+                {secondarySection.name}
               </a>
             </div>
           </div>
diff --git a/app/scripts/components/common/page-header/default-config.ts b/app/scripts/components/common/page-header/default-config.ts
index 1007419d2..4690a162e 100644
--- a/app/scripts/components/common/page-header/default-config.ts
+++ b/app/scripts/components/common/page-header/default-config.ts
@@ -71,10 +71,12 @@ let defaultSubNavItems: (
 
 const defaultFooterSettings = {
   secondarySection: {
-    id: 'email test',
-    title: 'email test',
-    to: '/data-catalog',
-    type: 'Email'
+    division: 'NASA EarthData 2024',
+    version: 'BETA VERSION',
+    title: 'NASA Official',
+    name: 'Manil Maskey',
+    to: 'test@example.com',
+    type: 'email'
   },
   returnToTop: true
 };
diff --git a/mock/veda.config.js b/mock/veda.config.js
index 547b8771b..44a49f284 100644
--- a/mock/veda.config.js
+++ b/mock/veda.config.js
@@ -1,8 +1,5 @@
 const dotEnvConfig = require('dotenv').config();
 const { parsed: config } = dotEnvConfig;
-function checkEnvFlag(value) {
-  return (value ?? '').toLowerCase() === 'true';
-}
 
 let mainNavItems = [
   {
@@ -53,9 +50,11 @@ let mainNavItems = [
 
 let footerSettings = {
   secondarySection: {
-    id: 'stories',
-    title: 'email test',
-    to: '/data-catalog',
+    division: 'NASA EarthData 2024',
+    version: process.env.APP_VERSION ?? 'BETA VERSION',
+    title: 'NASA Official',
+    name: 'Manil Maskey',
+    to: 'test@example.com',
     type: 'email'
   },
   returnToTop: true
diff --git a/parcel-resolver-veda/index.d.ts b/parcel-resolver-veda/index.d.ts
index e30e25906..2a1d26742 100644
--- a/parcel-resolver-veda/index.d.ts
+++ b/parcel-resolver-veda/index.d.ts
@@ -285,19 +285,25 @@ declare module 'veda' {
     to: string;
     type: 'internalLink';
   }
+
   interface ExternalNavLink {
     id: string;
     title: string;
     href: string;
     type: 'externalLink';
   }
+
   type NavLinkItem = ExternalNavLink | InternalNavLink;
+
   export interface SecondarySection {
-    id: string;
+    division: string;
+    version: string;
     title: string;
+    name: string;
     to: string;
     type: string;
   }
+
   export interface FooterSettings {
     secondarySection: SecondarySection;
     returnToTop: boolean;

From 13c9cb97569ad59891a63b011d98602ee780a2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 19 Dec 2024 10:02:52 +0100
Subject: [PATCH 32/35] Update color mappings, use system token instead of
 theme token

---
 app/scripts/styles/_veda-ui-theme-vars.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/scripts/styles/_veda-ui-theme-vars.scss b/app/scripts/styles/_veda-ui-theme-vars.scss
index 193ac287f..d52a6b040 100644
--- a/app/scripts/styles/_veda-ui-theme-vars.scss
+++ b/app/scripts/styles/_veda-ui-theme-vars.scss
@@ -22,14 +22,14 @@ $veda-uswds-fontweight-semibold: utils.font-weight('semibold');
 
 // COLORS
 $veda-uswds-color-primary-darker: utils.color('blue-warm-80v');
-$veda-uswds-color-primary-light: utils.color('primary-light');
+$veda-uswds-color-primary-light: utils.color('blue-30');
 $veda-uswds-color-secondary: utils.color('red-50');
 $veda-uswds-color-base-dark: utils.color('gray-cool-60');
 $veda-uswds-color-base-darkest: utils.color(
   'gray-cool-80'
 ); // re-mapped, theme-token 'base-darkest' originally mapped to 'gray-90'
 $veda-uswds-color-base-light: utils.color('gray-cool-30');
-$veda-uswds-color-base-lightest: utils.color('base-lightest');
+$veda-uswds-color-base-lightest: utils.color('gray-cool-4');
 $veda-uswds-color-base-ink: utils.color(
   'gray-cool-90'
 ); // re-mapped, theme-token 'ink' originally mapped to 'gray-90'

From b45d10877b4410762f66d95d64e0347274b9dfe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 19 Dec 2024 10:28:33 +0100
Subject: [PATCH 33/35] Replace values with theme vars

---
 app/scripts/components/common/page-footer/styles.scss | 4 ++--
 app/scripts/styles/_veda-ui-theme-vars.scss           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index ebeee5edc..8669d48b7 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -1,7 +1,7 @@
 @use '$styles/veda-ui-theme-vars.scss' as themeVars;
 
 .footer-text {
-  color: white;
+  color: themeVars.$veda-uswds-color-base-white;
   align-self: center;
   display: flex;
   font-size: themeVars.$veda-uswds-fontsize-sm;
@@ -11,7 +11,7 @@
 
 #return-to-top-container {
   padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
-  max-width: 64rem;
+  max-width: themeVars.$veda-uswds-spacing-desktop;
 }
 #footer_primary_container {
   padding: themeVars.$veda-uswds-padding-4 themeVars.$veda-uswds-padding-5;
diff --git a/app/scripts/styles/_veda-ui-theme-vars.scss b/app/scripts/styles/_veda-ui-theme-vars.scss
index d52a6b040..2736d3a9d 100644
--- a/app/scripts/styles/_veda-ui-theme-vars.scss
+++ b/app/scripts/styles/_veda-ui-theme-vars.scss
@@ -30,6 +30,7 @@ $veda-uswds-color-base-darkest: utils.color(
 ); // re-mapped, theme-token 'base-darkest' originally mapped to 'gray-90'
 $veda-uswds-color-base-light: utils.color('gray-cool-30');
 $veda-uswds-color-base-lightest: utils.color('gray-cool-4');
+$veda-uswds-color-base-white: utils.color('white');
 $veda-uswds-color-base-ink: utils.color(
   'gray-cool-90'
 ); // re-mapped, theme-token 'ink' originally mapped to 'gray-90'

From 3584e15faaa3ae1cff33f87b202ebd7aa26c0102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20R=C3=BChl?= <alice@developmentseed.org>
Date: Thu, 19 Dec 2024 11:37:14 +0100
Subject: [PATCH 34/35] Add role and aria-label to svg logo

---
 app/scripts/components/common/nasa-logo-color.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/scripts/components/common/nasa-logo-color.js b/app/scripts/components/common/nasa-logo-color.js
index d9b6b33bf..b89e5b275 100644
--- a/app/scripts/components/common/nasa-logo-color.js
+++ b/app/scripts/components/common/nasa-logo-color.js
@@ -5,6 +5,8 @@ import React from 'react';
 export default function NasaLogoColor() {
   return (
     <svg
+      role='img'
+      aria-label='NASA Logo'
       width='44'
       height='44'
       viewBox='0 0 44 44'

From 23850fd8d83b26d77494fea1c45d05e94c88b115 Mon Sep 17 00:00:00 2001
From: snmln <smalone@element84.com>
Date: Fri, 20 Dec 2024 15:17:12 -0500
Subject: [PATCH 35/35] corrcting layout, line-height, and coloring issues

---
 .../components/common/page-footer/index.tsx   | 101 +++++++++---------
 .../components/common/page-footer/styles.scss |   3 +
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/app/scripts/components/common/page-footer/index.tsx b/app/scripts/components/common/page-footer/index.tsx
index eb7503fbe..f23abf10e 100644
--- a/app/scripts/components/common/page-footer/index.tsx
+++ b/app/scripts/components/common/page-footer/index.tsx
@@ -85,58 +85,57 @@ export default function PageFooter({
     [mainNavItems]
   );
   return (
-    <>
-      <USWDSFooter
-        size='slim'
-        returnToTop={returnToTop && returnToTopButton()}
-        className={hideFooter && 'display-none'}
-        primary={
-          <div
-            id='footer_primary_container'
-            className=' grid-row bg-base-lightest usa-footer__primary-container'
-          >
-            <div className='mobile-lg:grid-col-8'>
-              <USWDSFooterNav
-                aria-label='Footer navigation'
-                size='slim'
-                links={primaryItems}
-              />
-            </div>
-            <div className='tablet:grid-col-4'>
-              <USWDSAddress
-                size='slim'
-                className='flex-justify-end'
-                items={secondaryItems}
-              />
-            </div>
+    <USWDSFooter
+      size='slim'
+      returnToTop={returnToTop && returnToTopButton()}
+      className={hideFooter && 'display-none'}
+      primary={
+        <div
+          id='footer_primary_container'
+          className=' grid-row  usa-footer__primary-container'
+        >
+          <div className='mobile-lg:grid-col-8'>
+            <USWDSFooterNav
+              aria-label='Footer navigation'
+              size='slim'
+              links={primaryItems}
+            />
+          </div>
+          <div className='tablet:grid-col-4'>
+            <USWDSAddress
+              size='slim'
+              className='flex-justify-end'
+              items={secondaryItems}
+            />
           </div>
-        }
-        secondary={
-          <div id='footer_secondary_container' className='grid-row'>
-            <div id='logo-container'>
-              <a id='logo-container-link' href='#'>
-                {logoSvg as JSX.Element}
-                <span className='footer-text'>
-                  {secondarySection.division} • {secondarySection.version}
-                </span>
-              </a>
-            </div>
-            <div className='grid-col-4 footer-text grid-gap-6 flex-justify-end'>
-              <span>{secondarySection.title}: </span>
-              <a
-                key={secondarySection.type}
-                href={`mailto:${secondarySection.to}`}
-              >
-                <Icon.Mail
-                  className='margin-right-1 width-205 height-auto position-relative'
-                  id='mail_icon'
-                />
-                {secondarySection.name}
-              </a>
-            </div>
+        </div>
+      }
+      secondary={
+        <div id='footer_secondary_container' className='grid-row'>
+          <div id='logo-container'>
+            <a id='logo-container-link' href='#'>
+              {logoSvg as JSX.Element}
+              <span className='footer-text'>
+                {secondarySection.division} • {secondarySection.version}
+              </span>
+            </a>
           </div>
-        }
-      />
-    </>
+          <div className='grid-col-4 footer-text grid-gap-6 flex-justify-end'>
+            <span>{secondarySection.title}: </span>
+            <a
+              key={secondarySection.type}
+              href={`mailto:${secondarySection.to}`}
+              className='text-primary-light'
+            >
+              <Icon.Mail
+                className='margin-right-1 width-205 height-auto position-relative'
+                id='mail_icon'
+              />
+              {secondarySection.name}
+            </a>
+          </div>
+        </div>
+      }
+    />
   );
 }
diff --git a/app/scripts/components/common/page-footer/styles.scss b/app/scripts/components/common/page-footer/styles.scss
index 8669d48b7..aa135a23c 100644
--- a/app/scripts/components/common/page-footer/styles.scss
+++ b/app/scripts/components/common/page-footer/styles.scss
@@ -41,3 +41,6 @@ address {
   font-size: themeVars.$veda-uswds-fontsize-sm;
   text-underline-offset: themeVars.$veda-uswds-spacing-5;
 }
+.usa-footer__contact-info {
+  line-height: unset;
+}