diff --git a/backend/Gemfile.lock b/backend/Gemfile.lock index 98ad584d5..93c73958b 100644 --- a/backend/Gemfile.lock +++ b/backend/Gemfile.lock @@ -356,12 +356,12 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) - nokogiri (1.16.0) + nokogiri (1.16.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.0-x86_64-darwin) + nokogiri (1.16.2-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.0-x86_64-linux) + nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) optimist (3.0.1) orm_adapter (0.5.0) diff --git a/frontend/containers/about/our-allies/component.tsx b/frontend/containers/about/our-allies/component.tsx index af2032885..a0750d644 100644 --- a/frontend/containers/about/our-allies/component.tsx +++ b/frontend/containers/about/our-allies/component.tsx @@ -5,6 +5,7 @@ import cx from 'classnames'; import Image from 'next/image'; import { useAlliesLogos, useSupportedByLogos } from './data'; +import Logo from './logo/component'; export const OurAllies = () => { const alliesLogos = useAlliesLogos(); @@ -27,16 +28,7 @@ export const OurAllies = () => { })} > {row.map((logo) => { - return ( - - {logo.alt} - - ); + return ; })} ); @@ -50,11 +42,7 @@ export const OurAllies = () => {
{supportedByLogos.map((logo) => { - return ( - - {logo.alt} - - ); + return ; })}
diff --git a/frontend/containers/about/our-allies/logo/component.tsx b/frontend/containers/about/our-allies/logo/component.tsx new file mode 100644 index 000000000..eb9007e46 --- /dev/null +++ b/frontend/containers/about/our-allies/logo/component.tsx @@ -0,0 +1,29 @@ +import { FC } from 'react'; + +import Image from 'next/image'; + +import Tooltip from 'components/tooltip'; + +import { OurAlliesLogoType } from './'; + +export const OurAlliesLogo: FC = ({ logo }) => { + return ( + + + {logo.alt} + + } + > + + {logo.alt} + + + + ); +}; + +export default OurAlliesLogo; diff --git a/frontend/containers/about/our-allies/logo/index.ts b/frontend/containers/about/our-allies/logo/index.ts new file mode 100644 index 000000000..a03cf4214 --- /dev/null +++ b/frontend/containers/about/our-allies/logo/index.ts @@ -0,0 +1,2 @@ +export type { OurAlliesLogoType } from './types'; +export { default } from './component'; diff --git a/frontend/containers/about/our-allies/logo/types.ts b/frontend/containers/about/our-allies/logo/types.ts new file mode 100644 index 000000000..910b5f1d4 --- /dev/null +++ b/frontend/containers/about/our-allies/logo/types.ts @@ -0,0 +1,8 @@ +export type OurAlliesLogoType = { + logo: { + src: string; + width: number; + height: number; + alt: string; + }; +}; diff --git a/frontend/containers/about/our-partners/card/component.tsx b/frontend/containers/about/our-partners/card/component.tsx index 943f0128b..1fe1530b1 100644 --- a/frontend/containers/about/our-partners/card/component.tsx +++ b/frontend/containers/about/our-partners/card/component.tsx @@ -20,7 +20,7 @@ export const OurPartnersCard: FC = ({ return (