diff --git a/client/pages/Explore.tsx b/client/pages/Explore.tsx index c7f1a1f3..5aec7c4c 100644 --- a/client/pages/Explore.tsx +++ b/client/pages/Explore.tsx @@ -164,36 +164,6 @@ export default function Explore() {

Our impact across the digital landscape

-
- {[ - { label: "Overview", href: "#overview" }, - { label: "Services", href: "#services" }, - { label: "Labs", href: "#labs" }, - { label: "Resources", href: "#resources" }, - { label: "Technology", href: "#technology" }, - ].map((item) => ( - - {item.label} - - ))} -
- - -
-
-
- {[ - { label: "Overview", href: "#overview" }, - { label: "Services", href: "#services" }, - { label: "Labs", href: "#labs" }, - { label: "Resources", href: "#resources" }, - { label: "Technology", href: "#technology" }, - ].map((item) => ( - - {item.label} - - ))} -
@@ -234,130 +204,79 @@ export default function Explore() { - {/* Offerings Overview */} + {/* Core Areas */}
-

- Everything We Offer -

-

- Explore services, programs, resources, and community -

- +

Core Areas

+

Services, programs, resources, and community

-
- {serviceOfferings.map((offering, idx) => ( - -
- -
- - {offering.title} - - {offering.icon && ( -
+ {(() => { + const combined = [...serviceOfferings, ...resourceOfferings]; + return ( +
+ {combined.map((offering: any, idx: number) => ( + +
+ +
+ + {offering.title} + {offering.icon && ( - // @ts-ignore - +
+ {/* @ts-ignore */} + +
)}
- )} -
- - {offering.description} - - {offering.tags && ( -
- {offering.tags.map((t: string) => ( - - {t} - - ))} -
- )} - - - - -
- ))} - -
- -
- {resourceOfferings.map((offering, idx) => ( - -
- -
- - {offering.title} - - {offering.icon && ( -
- {offering.icon && ( - // @ts-ignore - - )} -
- )} -
- - {offering.description} - - {offering.tags && ( -
- {offering.tags.map((t: string) => ( - - {t} - - ))} -
- )} -
- -
- {offering.actions.map((action) => ( - - ))} -
-
- - ))} -
+ + {offering.description} + + {offering.tags && ( +
+ {offering.tags.map((t: string) => ( + + {t} + + ))} +
+ )} + + + {offering.link ? ( + + ) : ( +
+ {offering.actions?.map((action: any) => ( + + ))} +
+ )} +
+
+ ))} +
+ ); + })()}