From a9fd5cec91af7692ec8c647c0b6ba0db8b70fa86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alice=20R=C3=BChl?= Date: Tue, 17 Dec 2024 12:11:02 +0100 Subject: [PATCH] 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({ {logoSvg as JSX.Element} - NASA EarthData 2024 • v0.17.0 - {/* {version} */} + {secondarySection.division} • {secondarySection.version}
- NASA Official: + {secondarySection.title}: - {secondarySection.title} + {secondarySection.name}
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;