feat: small updates

hicsail · Apr 18, 2024 · 2b14650 · 2b14650
1 parent ed26fd7
commit 2b14650
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/packages/client/src/components/NavBar.jsx b/packages/client/src/components/NavBar.jsx
@@ -63,7 +63,7 @@ export const NavBar = () => {
                 <ListItemButton
                   component={NavLink}
                   to={item.URL}
-                  selected={pathname === item.URL}
+                  selected={!item.Link.URL ? false : pathname === item.Link.URL}
                   target={item.Link.URL?.startsWith('http') ? '_blank' : null}
                 >
                   <ListItemText primary={item.Link.Name} />
@@ -73,7 +73,7 @@ export const NavBar = () => {
                 item.Subpages.length > 0 &&
                 item.Subpages.map((subitem) => (
                   <ListItem key={subitem.id} disablePadding sx={{ ml: 2 }}>
-                    <ListItemButton component={NavLink} to={subitem.URL} selected={pathname === subitem.URL}>
+                    <ListItemButton component={NavLink} to={subitem.URL}>
                       <ListItemText secondary={subitem.Name} />
                     </ListItemButton>
                   </ListItem>

diff --git a/packages/client/src/components/Router.jsx b/packages/client/src/components/Router.jsx
@@ -25,15 +25,15 @@ export const Router = ({ children }) => {
           element: <Home />
         },
         {
-          path: 'about-old',
+          path: 'about',
           element: <About />
         },
         {
           path: 'treatments-and-services',
           element: <TreatmentsServices />,
           children: [
             {
-              index: true,
+              index: 'services-to-the-health-system',
               element: <ServicesToTheHealthSystem />
             },
             {
@@ -46,16 +46,12 @@ export const Router = ({ children }) => {
             }
           ]
         },
-        {
-          path: 'testimonials',
-          element: <Testimonials />
-        },
         {
           path: 'research-and-evaluation',
           element: <ResearchAndEvals />
         },
         {
-          path: 'get-involved-old',
+          path: 'get-involved',
           element: <GetInvolved />
         },
         {

diff --git a/packages/client/src/components/TeamMember.jsx b/packages/client/src/components/TeamMember.jsx
@@ -56,7 +56,7 @@ export const TeamMember = ({ Name, Photo, Credentials, Pronouns, Languages, Role
             </Typography>
             <Grid container spacing={1}>
               {EBPs.split(',').map((EBP) => (
-                <Grid item>
+                <Grid item key={EBP}>
                   <Chip sx={{ fontStyle: 'italic', fontWeight: 'bold' }} key={EBP} label={EBP} />
                 </Grid>
               ))}

diff --git a/packages/client/src/gql.jsx b/packages/client/src/gql.jsx
@@ -68,7 +68,6 @@ export const GET_HOMEPAGE_CARDGRID = gql`
         attributes {
           CardGridCardData {
             id
-            Index
             Icon {
               data {
                 attributes {
@@ -186,7 +185,6 @@ export const GET_TREATMENTS_CARDGRID = gql`
         attributes {
           CardGridCardData {
             id
-            Index
             Icon {
               data {
                 attributes {
@@ -410,7 +408,6 @@ export const GET_GETINVOLVED_CARDGRID = gql`
         attributes {
           CardGridCardData {
             id
-            Index
             Icon {
               data {
                 attributes {

diff --git a/packages/client/src/pages/Home.jsx b/packages/client/src/pages/Home.jsx
@@ -27,7 +27,7 @@ function HomepageInfoPanelTop() {
   const { Title, Subtitle, Image, Icon, ButtonText, ButtonLink } = data.homePageInfoPanelTop.data.attributes.InfoPanelA;
   const imgUrl = import.meta.env.VITE_STRAPI_URL + Image.data?.attributes.url;
   const imgAlt = Image.data?.attributes.alternativeText;
-  const iconUrl = import.meta.env.VITE_STRAPI_URL + Icon.data?.attributes.url;
+  const iconUrl = Icon.data?.attributes.url ? import.meta.env.VITE_STRAPI_URL + Icon.data?.attributes.url : null;
   const iconAlt = Icon.data?.attributes.alternativeText;
 
   return (