cleaning up veda.config and styling

NASA-IMPACT · Dec 13, 2024 · 886912e · 886912e
1 parent bb5dcad
commit 886912e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 113 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)};