diff --git a/client/src/components/actor-card/index.js b/client/src/components/actor-card/index.js index cd9cccb..634a793 100644 --- a/client/src/components/actor-card/index.js +++ b/client/src/components/actor-card/index.js @@ -33,7 +33,7 @@ export default function ActorCard({
- + <Title as="h4" look="h6"> <Link to={url}>{title}</Link>

diff --git a/client/src/components/country-card/index.js b/client/src/components/country-card/index.js index 76b31d8..0cefa5d 100644 --- a/client/src/components/country-card/index.js +++ b/client/src/components/country-card/index.js @@ -38,7 +38,7 @@ export default function CountryCard({ color, description, fillColor, fillColorCo

- + {/* */} ); } diff --git a/client/src/components/directory-blocs/annuaire-bloc.js b/client/src/components/directory-blocs/annuaire-bloc.js index 9c61c72..d9106c8 100644 --- a/client/src/components/directory-blocs/annuaire-bloc.js +++ b/client/src/components/directory-blocs/annuaire-bloc.js @@ -54,7 +54,7 @@ function AnnuaireBloc({ selectedLetter }) { )) ? ( <> - + {`${el.fields.name_fr} (${el.fields.name_native})`} diff --git a/client/src/components/directory-blocs/structure-card.js b/client/src/components/directory-blocs/structure-card.js index 6d86832..0255220 100644 --- a/client/src/components/directory-blocs/structure-card.js +++ b/client/src/components/directory-blocs/structure-card.js @@ -29,11 +29,15 @@ function AddressCard({ address, displayName }) { <br /> {address.city && <Text className="d-inline" bold>{address.city}</Text>} </div> - <div> + <div className="fr-pt-1w"> {address.phonenumber && ( <Text className="d-inline"> <Icon name="ri-phone-fill"> - {address.phonenumber} + <a + href={`tel: ${address.phonenumber}`} + > + {address.phonenumber} + </a> </Icon> </Text> )} @@ -91,7 +95,7 @@ export default function StructureCard({ data, type, website }) { return ( <> <Container className={`fr-card fr-card--grey ${type}-border-card fr-pb-1w`}> - <Row className="fr-pt-1w"> + <Row className="fr-p-1w"> <Col> <Title as="h2" look="h4">{labels.cardTitle} @@ -109,7 +113,7 @@ export default function StructureCard({ data, type, website }) { ) : ''} - + {data?.length === 1 && ( <> @@ -127,7 +131,11 @@ export default function StructureCard({ data, type, website }) { {data[0].currentLocalisation.phonenumber && ( - {data[0].currentLocalisation.phonenumber} + + {data[0].currentLocalisation.phonenumber} + )} diff --git a/client/src/pages/country/components/actors/actors-identifiers-card.js b/client/src/pages/country/components/actors/actors-identifiers-card.js index 6d36a55..0e712be 100644 --- a/client/src/pages/country/components/actors/actors-identifiers-card.js +++ b/client/src/pages/country/components/actors/actors-identifiers-card.js @@ -1,4 +1,4 @@ -import { Callout, Col, Icon, Link, Row } from '@dataesr/react-dsfr'; +import { Callout, Col, Icon, Link, Row, Title } from '@dataesr/react-dsfr'; import PropTypes from 'prop-types'; function Identifiers({ type, identifiersId }) { @@ -88,12 +88,12 @@ function Identifiers({ type, identifiersId }) { {type.map((el, index) => ( -

+ <Icon name="ri-wikipedia-line" /> <Link href={getLink({ type: el, value: identifiersId[index] })} target="_blank"> {`${el.charAt(0).toUpperCase() + el.slice(1)} (${identifiersId[index]})`} </Link> - </h3> + ))} diff --git a/client/src/pages/country/components/actors/actors-socialMedias-card.js b/client/src/pages/country/components/actors/actors-socialMedias-card.js index 9474c88..c84e569 100644 --- a/client/src/pages/country/components/actors/actors-socialMedias-card.js +++ b/client/src/pages/country/components/actors/actors-socialMedias-card.js @@ -1,8 +1,8 @@ -import { Callout, Col, Icon, Link, Row } from '@dataesr/react-dsfr'; +import { Callout, Col, Icon, Link, Row, Title } from '@dataesr/react-dsfr'; import PropTypes from 'prop-types'; import { useEffect, useState } from 'react'; -import Title from '../../../../components/title'; +import Titre from '../../../../components/title'; import { renderIcon } from '../../../../utils/renderSocialMediasIcon'; function SocialNetworkCard({ actorId }) { @@ -26,7 +26,7 @@ function SocialNetworkCard({ actorId }) { return ( data?.data?.length > 0 && ( <> - - <h3 className="fr-card__title"> + <Title as="h3" look="h6"> <Icon name={`ri-${socialmedia.type}-line`} /> {renderIcon(socialmedia.type)} <Link href={socialmedia.account} target="_blank"> {socialmedia.type} </Link> - </h3> + ))} diff --git a/client/src/pages/country/components/actors/actors-website-card.js b/client/src/pages/country/components/actors/actors-website-card.js index 292fe62..8cfeee1 100644 --- a/client/src/pages/country/components/actors/actors-website-card.js +++ b/client/src/pages/country/components/actors/actors-website-card.js @@ -1,4 +1,4 @@ -import { Callout, Col, Icon, Link } from '@dataesr/react-dsfr'; +import { Callout, Col, Icon, Link, Title } from '@dataesr/react-dsfr'; import PropTypes from 'prop-types'; export default function WebSiteCard({ languages, links, name }) { @@ -11,12 +11,12 @@ export default function WebSiteCard({ languages, links, name }) { {languages.map((language, index) => ( -

+ <Icon name="ri-global-line" /> <Link href={links[index]} target="blank"> {`${name} (${language || ''})`} </Link> - </h3> + ))} diff --git a/client/src/pages/country/components/actors/actors-wikipedia-card.js b/client/src/pages/country/components/actors/actors-wikipedia-card.js index a2f34ab..d81502c 100644 --- a/client/src/pages/country/components/actors/actors-wikipedia-card.js +++ b/client/src/pages/country/components/actors/actors-wikipedia-card.js @@ -1,4 +1,4 @@ -import { Callout, Col, Icon, Link } from '@dataesr/react-dsfr'; +import { Callout, Col, Icon, Link, Title } from '@dataesr/react-dsfr'; import PropTypes from 'prop-types'; export default function WikipediaCard({ title, nameEn }) { @@ -6,7 +6,7 @@ export default function WikipediaCard({ title, nameEn }) { (title && nameEn) && ( -

+ <Icon name="ri-wikipedia-line" /> <Link href={`https://en.wikipedia.org/wiki/${encodeURIComponent(nameEn?.replace(/\s/g, '_'))}`} @@ -15,7 +15,7 @@ export default function WikipediaCard({ title, nameEn }) { > {`Wikipedia (${title})`} </Link> - </h3> + ) diff --git a/client/src/pages/country/components/country-links/components/tile.js b/client/src/pages/country/components/country-links/components/tile.js index 4cbf483..1b6e6f2 100644 --- a/client/src/pages/country/components/country-links/components/tile.js +++ b/client/src/pages/country/components/country-links/components/tile.js @@ -1,17 +1,17 @@ import PropTypes from 'prop-types'; -import { Badge } from '@dataesr/react-dsfr'; +import { Badge, Title } from '@dataesr/react-dsfr'; import './styles.scss'; export default function RessourceTile({ pictogram, title, href, description, badge, colorFamily, date }) { return (
-
-

- {title} -

+
+ + <a className="fr-tile__link" target="_blank" rel="noopener noreferrer" href={href}>{title}</a> +

{description}

{date}