diff --git a/client/src/assets/img/logo-curiexplore.svg b/client/src/assets/img/logo-curiexplore.svg new file mode 100644 index 0000000..8e6df1e --- /dev/null +++ b/client/src/assets/img/logo-curiexplore.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/components/country-card/index.js b/client/src/components/country-card/index.js index 88721be..2545cfd 100644 --- a/client/src/components/country-card/index.js +++ b/client/src/components/country-card/index.js @@ -10,18 +10,20 @@ export default function CountryCard({ color, description, fillColor, isoCode, ti
- - - +
+ + + +
diff --git a/client/src/components/directory-blocs/annuaire-bloc.js b/client/src/components/directory-blocs/annuaire-bloc.js index e295b9e..9c61c72 100644 --- a/client/src/components/directory-blocs/annuaire-bloc.js +++ b/client/src/components/directory-blocs/annuaire-bloc.js @@ -63,7 +63,7 @@ function AnnuaireBloc({ selectedLetter }) { - + item !== null && item.iso3 === el.fields.iso3)} style={{ height: '430px' }} diff --git a/client/src/components/generic-card/index.js b/client/src/components/generic-card/index.js index c118894..4079d3c 100644 --- a/client/src/components/generic-card/index.js +++ b/client/src/components/generic-card/index.js @@ -12,12 +12,12 @@ export default function PopulationCard({ {description} -

- {indicator} -

+

+ {indicator} +

); diff --git a/client/src/components/indicator-card/index.js b/client/src/components/indicator-card/index.js index 573f218..7b25d4f 100644 --- a/client/src/components/indicator-card/index.js +++ b/client/src/components/indicator-card/index.js @@ -9,14 +9,14 @@ export default function IndicatorCard({ return (
+ + {description} +
- - {description} -

{indicator}

diff --git a/client/src/layout/footer.js b/client/src/layout/footer.js index 6a4c4cf..5a6ba4a 100644 --- a/client/src/layout/footer.js +++ b/client/src/layout/footer.js @@ -17,7 +17,7 @@ export default function Footer() { return ( - + }> L'équipe et son projet @@ -32,7 +32,7 @@ export default function Footer() { Github - + }> scanR @@ -46,7 +46,7 @@ export default function Footer() { Baromètre de la Science Ouverte - + }> {renderIcon('Twitter')} Twitter diff --git a/client/src/layout/header/index.js b/client/src/layout/header/index.js index d1dff6b..b0f4506 100644 --- a/client/src/layout/header/index.js +++ b/client/src/layout/header/index.js @@ -18,6 +18,8 @@ import SearchBar from '../../components/search-bar'; import useDebounce from './hooks/useDebounce'; import countries from '../../assets/data/countriesList.json'; +import logoCuriexplore from '../../assets/img/logo-curiexplore.svg'; + const { REACT_APP_HEADER_TAG: headerTag, REACT_APP_HEADER_TAG: headerTagColor, @@ -89,12 +91,11 @@ export default function Header({ switchTheme }) { - CurieXplore + Logo CurieXplore {headerTag && } )} - description="La plateforme d'exploration des systèmes d'enseignement supérieur, - de recherche et d'innovation à l'international" + description="" /> diff --git a/client/src/pages/accessibility.js b/client/src/pages/accessibility.js index 2fc0430..a3c6e88 100644 --- a/client/src/pages/accessibility.js +++ b/client/src/pages/accessibility.js @@ -4,7 +4,7 @@ import { Col, Container, Row, Text, Breadcrumb, BreadcrumbItem, Title } from '@d import { useTitle } from '../hooks/usePageTitle'; export default function MentionsLegalesPage() { - useTitle('Curiexplore - Accessibilité'); + useTitle('Accessibilité - CurieXplore'); return ( diff --git a/client/src/pages/contact.js b/client/src/pages/contact.js index c03a9de..3555d11 100644 --- a/client/src/pages/contact.js +++ b/client/src/pages/contact.js @@ -6,7 +6,7 @@ import image1 from '../assets/img/mail-send.svg'; import { useTitle } from '../hooks/usePageTitle'; export default function ContactsAndResourcesPage() { - useTitle('Curiexplore - Contacts'); + useTitle('Contacts - Curiexplore'); return ( diff --git a/client/src/pages/country/components/actors/[id].js b/client/src/pages/country/components/actors/[id].js index 83e18d3..f1ebea0 100644 --- a/client/src/pages/country/components/actors/[id].js +++ b/client/src/pages/country/components/actors/[id].js @@ -78,7 +78,7 @@ export default function Actor() { const actorWebsiteUrl = dataActor.websites.map((url) => url.url); const actorNameEN = dataActor.currentName.nameEn; - useTitle(`Curiexplore - ${dataActor.displayName}`); + useTitle(`${dataActor.displayName} - Curiexplore`); if (!dataActor) { return ( @@ -117,7 +117,7 @@ export default function Actor() { { dataActor.currentLocalisation.geometry && ( - + ) diff --git a/client/src/pages/country/components/actors/index.js b/client/src/pages/country/components/actors/index.js index 1825057..61ae100 100644 --- a/client/src/pages/country/components/actors/index.js +++ b/client/src/pages/country/components/actors/index.js @@ -21,7 +21,7 @@ export default function ActorsPage() { const contextData = useOutletContext(); const data = contextData['actors-data']; const [selectedCategory, setSelectedCategory] = useState(null); - useTitle('Curiexplore - Les acteurs'); + useTitle('Les acteurs - Curiexplore'); const categoriesLabels = [ { @@ -153,7 +153,9 @@ export default function ActorsPage() { ) : null} - +
+ +
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 cc13518..4cbf483 100644 --- a/client/src/pages/country/components/country-links/components/tile.js +++ b/client/src/pages/country/components/country-links/components/tile.js @@ -6,12 +6,12 @@ export default function RessourceTile({ pictogram, title, href, description, bad return (
-
- -

{title}

+
+ +

{description}

{date}

diff --git a/client/src/pages/country/components/country-links/index.js b/client/src/pages/country/components/country-links/index.js index 98cead1..04f69a7 100644 --- a/client/src/pages/country/components/country-links/index.js +++ b/client/src/pages/country/components/country-links/index.js @@ -1,8 +1,9 @@ import { useParams } from 'react-router-dom'; -import { Col, Container, Row } from '@dataesr/react-dsfr'; +import { Col, Container, Row, Text, Icon } from '@dataesr/react-dsfr'; import useFetchData from './hooks/useFetchData'; import RessourceTile from './components/tile'; +import { useTitle } from '../../../../hooks/usePageTitle'; const mappings = { openData: { @@ -25,6 +26,7 @@ const mappings = { export default function CountryLinksPages() { const { isoCode } = useParams(); const { data, isLoading } = useFetchData({ isoCode }); + useTitle('Liens utiles - Curiexplore'); if (isLoading) { return
Chargement en cours ...
; @@ -36,6 +38,15 @@ export default function CountryLinksPages() { return ( + + + + + Certains des éléments ci-dessous peuvent être dans la langue d'origine. + + + + {data.records.map((link) => ( diff --git a/client/src/pages/country/components/france-cooperation.js b/client/src/pages/country/components/france-cooperation.js index c53f00f..8d218eb 100644 --- a/client/src/pages/country/components/france-cooperation.js +++ b/client/src/pages/country/components/france-cooperation.js @@ -8,6 +8,7 @@ import PublicationsChart from '../../../components/open-alex-charts/publications import InstitutionsChart from '../../../components/open-alex-charts/institutions-chart'; import Title from '../../../components/title'; import getLabel from '../../../utils/getLabel'; +import { useTitle } from '../../../hooks/usePageTitle'; export default function FranceCooperationPage() { const { isoCode } = useParams(); @@ -19,6 +20,7 @@ export default function FranceCooperationPage() { const urlProjects = `${process.env.REACT_APP_SCANR_API_URL}/projects/search`; const urlStructures = `${process.env.REACT_APP_SCANR_API_URL}/structures/search`; const years = useMemo(() => ([2017, 2018, 2019]), []); + useTitle('Coopération française - CurieXplore'); useEffect(() => { setIso2(contextData['curiexplore-pays'].find((country) => country.fields.iso3 === isoCode).fields.iso2); diff --git a/client/src/pages/country/components/higher-education/index.js b/client/src/pages/country/components/higher-education/index.js index bbc4d69..0ca0cf1 100644 --- a/client/src/pages/country/components/higher-education/index.js +++ b/client/src/pages/country/components/higher-education/index.js @@ -10,12 +10,14 @@ import PieChart from './components/donut/index'; import Pyramid from './components/pyramid/index'; import EducationIndex from './components/education-index'; import Overview from './components/overview'; +import { useTitle } from '../../../../hooks/usePageTitle'; export default function CountryHigherEducationPage() { const contextData = useOutletContext(); const data = contextData['curiexplore-analyse']; const dataIDH = contextData['curiexplore-donnees-quantitatives']; let dataES = []; + useTitle('Enseignement supérieur - Curiexplore'); const charts1st = charts.filter((indic) => indic.theme === 'niveau'); const charts2nd = charts.filter((indic) => indic.theme === 'domaine'); diff --git a/client/src/pages/country/components/international-cooperation.js b/client/src/pages/country/components/international-cooperation.js index ced77e2..5c3bc85 100644 --- a/client/src/pages/country/components/international-cooperation.js +++ b/client/src/pages/country/components/international-cooperation.js @@ -1,10 +1,12 @@ import { useOutletContext } from 'react-router-dom'; import { v4 as uuidv4 } from 'uuid'; import HtmlAmbassyBloc from '../../../components/html-ambassy-bloc'; +import { useTitle } from '../../../hooks/usePageTitle'; export default function InternationalCooperationPage() { const contextData = useOutletContext(); const data = contextData['curiexplore-analyse']; + useTitle('Coopération internationale - Curiexplore'); const blocs = []; if (data.length === 0) { diff --git a/client/src/pages/country/components/policy.js b/client/src/pages/country/components/policy.js index 56fcb93..ee930a7 100644 --- a/client/src/pages/country/components/policy.js +++ b/client/src/pages/country/components/policy.js @@ -1,10 +1,12 @@ import { useOutletContext } from 'react-router-dom'; import { v4 as uuidv4 } from 'uuid'; import HtmlAmbassyBloc from '../../../components/html-ambassy-bloc'; +import { useTitle } from '../../../hooks/usePageTitle'; export default function CountryPolicyPage() { const contextData = useOutletContext(); const data = contextData['curiexplore-analyse']; + useTitle("Politique de l'enseignement supérieur, de la recherche et de l'inovation - CurieXplore"); const blocs = []; if (data.length !== 0) { diff --git a/client/src/pages/country/components/profile/index.js b/client/src/pages/country/components/profile/index.js index 24ec8cd..88ac4c9 100644 --- a/client/src/pages/country/components/profile/index.js +++ b/client/src/pages/country/components/profile/index.js @@ -65,18 +65,20 @@ export default function CountryProfilePage() { <> - - - +
+ + + +
diff --git a/client/src/pages/country/components/research/index.js b/client/src/pages/country/components/research/index.js index 70219db..b0ed63c 100644 --- a/client/src/pages/country/components/research/index.js +++ b/client/src/pages/country/components/research/index.js @@ -10,6 +10,7 @@ import Overview from './components/overview'; import Title from '../../../../components/title'; import charts from './charts.json'; import ThematicsChart from '../../../../components/open-alex-charts/thematics-chart'; +import { useTitle } from '../../../../hooks/usePageTitle'; export default function CountryResearchPage() { const { isoCode } = useParams(); @@ -18,6 +19,7 @@ export default function CountryResearchPage() { const data = contextData['curiexplore-analyse']; const dataOverview = contextData['curiexplore-donnees-quantitatives']; let dataRI = []; + useTitle('Recherche et Innovation - CurieXplore'); const charts1st = charts.filter((indic) => indic.theme === 'budget'); const charts2nd = charts.filter((indic) => indic.theme === 'personnel'); diff --git a/client/src/pages/country/components/similar-countries.js b/client/src/pages/country/components/similar-countries.js index eeb4e7b..857da54 100644 --- a/client/src/pages/country/components/similar-countries.js +++ b/client/src/pages/country/components/similar-countries.js @@ -1,6 +1,7 @@ import { Container, Row, Col } from '@dataesr/react-dsfr'; import Parser from 'html-react-parser'; import { useOutletContext, useParams } from 'react-router-dom'; +import { useTitle } from '../../../hooks/usePageTitle'; import groups from '../../../assets/data/groups.json'; import AdaptativeList from '../../../components/adaptative-list'; @@ -13,6 +14,7 @@ import getLabel from '../../../utils/getLabel'; export default function SimilarCountriesPage() { const contextData = useOutletContext(); const { isoCode } = useParams(); + useTitle('Pays similaires - CurieXplore'); const dataCountry = contextData['curiexplore-pays'].find((country) => country.fields.iso3 === isoCode); const dataIDH = contextData['curiexplore-donnees-quantitatives']; diff --git a/client/src/pages/country/components/students-mobility/index.js b/client/src/pages/country/components/students-mobility/index.js index 092e4dc..da199c1 100644 --- a/client/src/pages/country/components/students-mobility/index.js +++ b/client/src/pages/country/components/students-mobility/index.js @@ -7,10 +7,12 @@ import MobilityCallOut from './components/mobility'; import Title from '../../../../components/title'; import HtmlAmbassyBloc from '../../../../components/html-ambassy-bloc'; import charts from './charts.json'; +import { useTitle } from '../../../../hooks/usePageTitle'; export default function StudentsMobilityPage() { const contextData = useOutletContext(); const analyse = contextData['curiexplore-analyse']; + useTitle('Mobilité étudiante - CurieXplore'); const blocs = []; if (analyse.length !== 0) { diff --git a/client/src/pages/country/index.js b/client/src/pages/country/index.js index 1bdb468..21c7942 100644 --- a/client/src/pages/country/index.js +++ b/client/src/pages/country/index.js @@ -45,7 +45,7 @@ export default function Fiche({ exportState }) { const [exportList, setExportList] = useState([]); const [isExport, setIsExport] = useState(false); - useTitle(`Curiexplore - ${dataPays?.name_fr || ''}`); + useTitle(`${dataPays?.name_fr || ''} - Curiexplore`); useEffect(() => { setIsExport(exportState); diff --git a/client/src/pages/directory/index.js b/client/src/pages/directory/index.js index 5f1ebbc..611e2e8 100644 --- a/client/src/pages/directory/index.js +++ b/client/src/pages/directory/index.js @@ -37,7 +37,7 @@ Filter.propTypes = { export default function DirectoryPage() { const [selectedLetter, setSelectedLetter] = useState('a'); - useTitle('Curiexplore - Annuaire'); + useTitle('Annuaire - Curiexplore'); return ( <Container as="section"> <Filter selectedLetter={selectedLetter} setSelectedLetterHandler={setSelectedLetter} /> diff --git a/client/src/pages/homepage/components/country-list.js b/client/src/pages/homepage/components/country-list.js index fc0abda..5af720c 100644 --- a/client/src/pages/homepage/components/country-list.js +++ b/client/src/pages/homepage/components/country-list.js @@ -38,7 +38,7 @@ export default function CountryList({ region }) { <Row gutters spacing="mb-6w"> {countriesToShow.map(([letter, countries]) => ( <Col n="3" key={letter}> - <Title as="h2" look="h6" className="fr-mb-1v" size="lead" bold> + <Title as="h3" look="h6" className="fr-mb-1v" size="lead" bold> {letter.toUpperCase()}
diff --git a/client/src/pages/homepage/components/last-updated.js b/client/src/pages/homepage/components/last-updated.js index 074483d..fdc3227 100644 --- a/client/src/pages/homepage/components/last-updated.js +++ b/client/src/pages/homepage/components/last-updated.js @@ -53,7 +53,7 @@ export default function LastUpdated() { +

Mis à jour le {' '} - Zoom sur... + Zoom sur... Cliquez sur un bouton pour filtrer la carte et la liste ci-dessous diff --git a/client/src/pages/homepage/index.js b/client/src/pages/homepage/index.js index c8662be..eb9a30f 100644 --- a/client/src/pages/homepage/index.js +++ b/client/src/pages/homepage/index.js @@ -1,4 +1,4 @@ -import { Col, Container, Row } from '@dataesr/react-dsfr'; +import { Col, Container, Row, Title } from '@dataesr/react-dsfr'; import { useState } from 'react'; import { MapContainer } from 'react-leaflet'; import WorldMap from './components/world-map'; @@ -9,27 +9,37 @@ import { useTitle } from '../../hooks/usePageTitle'; export default function HomePage() { const [region, setRegion] = useState('world'); - useTitle('Curiexplore - Accueil'); + useTitle('Accueil - Curiexplore'); return ( <> - + + + + + La plateforme d'exploration des systèmes d'enseignement supérieur, + de recherche et d'innovation à l'international + + + - - - +

+ + + +
diff --git a/client/src/pages/mentions-legales.js b/client/src/pages/mentions-legales.js index bba9501..ef5a51f 100644 --- a/client/src/pages/mentions-legales.js +++ b/client/src/pages/mentions-legales.js @@ -7,7 +7,7 @@ import logoMESR from '../assets/img/logo-mesr.svg'; import { useTitle } from '../hooks/usePageTitle'; export default function MentionsLegalesPage() { - useTitle('Curiexplore - Mentions légales'); + useTitle('Mentions légales - Curiexplore'); return ( diff --git a/client/src/pages/ressources/ressources.js b/client/src/pages/ressources/ressources.js index 0cf1ecf..86f5486 100644 --- a/client/src/pages/ressources/ressources.js +++ b/client/src/pages/ressources/ressources.js @@ -20,7 +20,7 @@ const mappings = { }; export default function RessourcesPage() { - useTitle('Curiexplore - Ressources'); + useTitle('Ressources - Curiexplore'); return ( diff --git a/client/src/pages/team-project.js b/client/src/pages/team-project.js index 21d2b7b..f41209f 100644 --- a/client/src/pages/team-project.js +++ b/client/src/pages/team-project.js @@ -6,7 +6,7 @@ import image1 from '../assets/img/human-cooperation.svg'; import { useTitle } from '../hooks/usePageTitle'; export default function ProjetEtEquipe() { - useTitle("Curiexplore - L'équipe et son projet"); + useTitle("L'équipe et son projet - Curiexplore"); return (