rename function

GSA-TTS · Dec 12, 2024 · 586fab5 · 586fab5
1 parent f8b7858
commit 586fab5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/apps/spotlight/src/components/Footer.astro b/apps/spotlight/src/components/Footer.astro
@@ -1,7 +1,7 @@
 ---
 import { type GithubRepository, getBranchTreeUrl } from '../lib/github.js';
 import { Image } from 'astro:assets';
-import { getBaseUrl } from '../routes';
+import { getPublicDirUrl } from '../routes';
 
 type Props = {
   github: GithubRepository;
@@ -26,7 +26,7 @@ const { github } = Astro.props;
                   class="usa-identifier__logo GSAFooter__logo"
                 >
                   <Image
-                    src=`${getBaseUrl()}images/gsa-logo.svg`
+                    src=`${getPublicDirUrl()}images/gsa-logo.svg`
                     alt="GSA.gov home."
                     width="60"
                     height="60"

diff --git a/apps/spotlight/src/components/Header.astro b/apps/spotlight/src/components/Header.astro
@@ -2,7 +2,7 @@
 import closeSvg from '@atj/design/static/uswds/img/usa-icons/close.svg';
 import * as routes from '../routes';
 import { Image } from 'astro:assets';
-import { getBaseUrl } from '../routes';
+import { getPublicDirUrl } from '../routes';
 
 const getNavLinkClasses = (url: string) => {
   if (url === Astro.url.pathname) {
@@ -12,8 +12,10 @@ const getNavLinkClasses = (url: string) => {
   }
 };
 
-const currentRoute = Astro.url.pathname;
-const isAboutContent = currentRoute.startsWith('/about');
+const currentRoute = Astro.url.href;
+console.log(currentRoute);
+console.log(`${routes.getHomeUrl()}about`);
+const isAboutContent = currentRoute.startsWith(`${routes.getHomeUrl()}about`);
 const showAboutContent = false;
 ---
 
@@ -32,7 +34,7 @@ const showAboutContent = false;
       <em class="usa-logo__text">
         <a href={routes.getHomeUrl()} title="10x Forms Platform">
           <Image
-            src=`${getBaseUrl()}images/10x-logo.svg`
+            src=`${getPublicDirUrl()}images/10x-logo.svg`
             alt="10x Forms Platform home"
             width="72"
             height="34"

diff --git a/apps/spotlight/src/routes.ts b/apps/spotlight/src/routes.ts
@@ -25,7 +25,7 @@ export const getStorybookUrl = () => {
   return `${context.baseUrl}design/index.html`;
 };
 
-export const getBaseUrl = () => {
+export const getPublicDirUrl = () => {
   const context = getAppContext();
   return context.baseUrl;
 };