diff --git a/client/src/pages/european-projects/components/custom-breadcrumb/index.tsx b/client/src/pages/european-projects/components/custom-breadcrumb/index.tsx index 9fb603361..f5339f1bb 100644 --- a/client/src/pages/european-projects/components/custom-breadcrumb/index.tsx +++ b/client/src/pages/european-projects/components/custom-breadcrumb/index.tsx @@ -10,82 +10,46 @@ export default function CustomBreadcrumb({ pageKey }) { label: "Tableau de bord des projets européens - Horizon Europe", link: "/european-projects", }, - "analyse": { - label: "Analyse", - link: "/european-projects/analyse", + "general": { + label: "General", + link: "/european-projects/general", }, "synthese": { label: "Synthèse Horizon Europe", - link: "/european-projects/analyse/synthese", + link: "/european-projects/general/synthese", }, "positionnement": { label: "Positionnement", - link: "/european-projects/analyse/positionnement", + link: "/european-projects/general/positionnement", }, "collaboration": { label: "Collaboration", - link: "/european-projects/analyse/collaboration", + link: "/european-projects/general/collaboration", }, "evolution": { label: "Evolution", - link: "/european-projects/analyse/evolution", + link: "/european-projects/general/evolution", }, "appel-a-projets": { label: "Appel à projets", - link: "/european-projects/analyse/appel-a-projets", + link: "/european-projects/general/appel-a-projets", }, "beneficiaires": { label: "Bénéficiaires", - link: "/european-projects/analyse/beneficiaires", + link: "/european-projects/general/beneficiaires", }, "erc": { label: "ERC", - link: "/european-projects/analyse/erc", + link: "/european-projects/erc", }, "msca": { label: "MSCA", - link: "/european-projects/analyse/msca", - }, - "liste-des-appels-a-projets": { - label: "Liste des appels à projets", - link: "/european-projects/liste-des-appels-a-projets", - }, - "chiffres-cles-tableau": { - label: "Chiffres-clés tableau", - link: "/european-projects/chiffres-cles-tableau", - }, - "objectifs": { - label: "Objectifs", - link: "/european-projects/objectifs", - }, - "collaborations-chiffrees": { - label: "Collaborations chiffrées", - link: "/european-projects/collaborations-chiffrees", - }, - "pays": { - label: "Pays", - link: "/european-projects/pays", - }, - "pays-evolution": { - label: "Pays évolution", - link: "/european-projects/pays-evolution", - }, - "typologie-des-participants": { - label: "Typologie des participants", - link: "/european-projects/typologie-des-participants", - }, - "participants-francais": { - label: "Participants français", - link: "/european-projects/participants-francais", - }, - "participants-tous-pays": { - label: "Participants tous pays", - link: "/european-projects/participants-tous-pays", - }, - "participants-hors-pays": { - label: "Participants hors pays", - link: "/european-projects/participants-hors-pays", + link: "/european-projects/msca", }, + "projets-collaboratifs": { + label: "Projets collaboratifs", + link: "/european-projects/projets-collaboratifs", + } }; const currentPage = pages[pageKey]; diff --git a/client/src/pages/european-projects/components/pages/analysis/index.tsx b/client/src/pages/european-projects/components/pages/general/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/index.tsx rename to client/src/pages/european-projects/components/pages/general/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/menu.tsx b/client/src/pages/european-projects/components/pages/general/menu.tsx similarity index 67% rename from client/src/pages/european-projects/components/pages/analysis/menu.tsx rename to client/src/pages/european-projects/components/pages/general/menu.tsx index e17ccab07..86fe52213 100644 --- a/client/src/pages/european-projects/components/pages/analysis/menu.tsx +++ b/client/src/pages/european-projects/components/pages/general/menu.tsx @@ -14,7 +14,7 @@ export default function Menu() {
  • Synthèse @@ -23,7 +23,7 @@ export default function Menu() {
  • Positionnement @@ -32,7 +32,7 @@ export default function Menu() {
  • Collaboration @@ -41,7 +41,7 @@ export default function Menu() {
  • Evolution @@ -50,7 +50,7 @@ export default function Menu() {
  • Appel à projets @@ -59,30 +59,12 @@ export default function Menu() {
  • Bénéficiaires
  • -
  • - - ERC - -
  • -
  • - - MSCA - -
  • ); diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/index.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/index.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/options.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/options.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/options.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/options.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/query.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/query.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/query.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/query.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/template.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/template.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/template.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/utils.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/utils.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/funded-objectives/utils.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/funded-objectives/utils.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/index.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/index.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/options.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/options.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/options.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/options.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/query.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/query.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/query.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/query.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/template.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/template.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/template.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/utils.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/utils.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/main-beneficiaries/utils.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/main-beneficiaries/utils.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/index.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/index.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/options.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/options.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/options.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/options.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/query.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/query.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/query.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/query.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/template.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/template.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/template.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/utils.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/utils.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-1/utils.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-1/utils.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/index.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/index.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/options.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/options.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/options.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/options.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/query.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/query.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/query.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/query.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/template.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/template.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/template.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/utils.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/utils.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/projects-types-2/utils.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/projects-types-2/utils.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/index.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/index.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/query.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/query.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/query.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/query.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/styles.scss b/client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/styles.scss similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/styles.scss rename to client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/styles.scss diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/template.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/template.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/template.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/utils.tsx b/client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/utils.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/charts/synthesis-focus/utils.tsx rename to client/src/pages/european-projects/components/pages/general/overview/charts/synthesis-focus/utils.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/overview/index.tsx b/client/src/pages/european-projects/components/pages/general/overview/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/overview/index.tsx rename to client/src/pages/european-projects/components/pages/general/overview/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/index.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/index.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-coordination_number-succes-rate.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-coordination_number-succes-rate.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-coordination_number-succes-rate.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-coordination_number-succes-rate.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-coordination_number.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-coordination_number.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-coordination_number.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-coordination_number.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-number_involved-succes-rate.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-number_involved-succes-rate.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-number_involved-succes-rate.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-number_involved-succes-rate.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-number_involved.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-number_involved.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-number_involved.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-number_involved.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-succes-rate.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-succes-rate.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options-succes-rate.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options-succes-rate.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/options.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/options.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/query.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/query.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/query.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/query.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/template.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/funding-ranking/template.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/funding-ranking/template.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/intro/index.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/intro/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/intro/index.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/intro/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/index.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/index.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/index.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/options.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/options.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/options.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/options.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/query.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/query.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/query.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/query.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/template.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/template.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/template.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/utils.tsx b/client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/utils.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/charts/top-10-beneficiaries/utils.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/charts/top-10-beneficiaries/utils.tsx diff --git a/client/src/pages/european-projects/components/pages/analysis/positioning/index.tsx b/client/src/pages/european-projects/components/pages/general/positioning/index.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/analysis/positioning/index.tsx rename to client/src/pages/european-projects/components/pages/general/positioning/index.tsx diff --git a/client/src/pages/european-projects/components/side-menu.tsx b/client/src/pages/european-projects/components/side-menu.tsx index 3b013f8b0..4944546fc 100644 --- a/client/src/pages/european-projects/components/side-menu.tsx +++ b/client/src/pages/european-projects/components/side-menu.tsx @@ -16,71 +16,28 @@ export default function CustomSideMenu() { - Analyse + Général - Liste des appels à projets + Projets collaboratifs - Chiffres-clés tableau + MSCA - Objectifs - - - Collaborations chiffrées - - - Pays - - - Pays évolution - - - Typologie des participants - - - Participants français - - - Participants tous pays - - - Participants hors pays + ERC diff --git a/client/src/pages/european-projects/routes.tsx b/client/src/pages/european-projects/routes.tsx index 162875901..74b51e7e6 100644 --- a/client/src/pages/european-projects/routes.tsx +++ b/client/src/pages/european-projects/routes.tsx @@ -1,34 +1,25 @@ import { Routes, Route } from 'react-router-dom'; import Main from './index.tsx'; -import AnalysisHomepage from './components/pages/analysis/index.tsx'; -import Overview from './components/pages/analysis/overview/index.tsx'; -import Positioning from './components/pages/analysis/positioning/index.tsx'; +import AnalysisHomepage from './components/pages/general/index.tsx'; +import Overview from './components/pages/general/overview/index.tsx'; +import Positioning from './components/pages/general/positioning/index.tsx'; export default function EuropeanProjectsRoutes() { return ( }> - }> + }> } /> } /> Collaboration} /> Evolution} /> Appel à projets} /> Bénéficiaires} /> - ERC} /> - MSCA} /> - Liste des appels à projets} /> - Chiffres-clés tableau} /> - Objectifs} /> - Collaborations chiffrées} /> - Pays} /> - Pays évolution} /> - Typologie des participants} /> - Participants français} /> - Participants tous pays} /> - Participants hors pays} /> + Projets collaboratifs} /> + MSCA} /> + ERC} /> );