feat(alternance): ajout de la section découverte apprentissage

DNUM-SocialGouv · May 4, 2023 · 57da01f · 57da01f
1 parent 6975afb
commit 57da01f
Show file tree

Hide file tree

Showing 34 changed files with 258 additions and 228 deletions.
diff --git a/src/client/components/features/Accompagnement/Rechercher/RechercherAccompagnement.test.tsx b/src/client/components/features/Accompagnement/Rechercher/RechercherAccompagnement.test.tsx
@@ -151,7 +151,7 @@ describe('RechercherAccompagnement', () => {
 			);
 
 			// When
-			const partenaireList = screen.getByRole('list', { name : 'Liste des partenaires' });
+			const partenaireList = screen.getByRole('list', { name : 'Liste des partenaires et des services' });
 			const partenaireListItemList = within(partenaireList).getAllByRole('listitem');
 			// Then
 			expect(partenaireList).toBeInTheDocument();

diff --git a/src/client/components/features/Accompagnement/Rechercher/RechercherAccompagnement.tsx b/src/client/components/features/Accompagnement/Rechercher/RechercherAccompagnement.tsx
@@ -6,10 +6,10 @@ import {
 import {
 	RésultatRechercherAccompagnement,
 } from '~/client/components/features/Accompagnement/Rechercher/Résultat/RésultatRechercherAccompagnement';
-import { PartnerCardList } from '~/client/components/features/Partner/Card/PartnerCard';
-import { InfoJeunesPartner } from '~/client/components/features/Partner/InfoJeunesPartner';
-import { MissionsLocalesPartner } from '~/client/components/features/Partner/MissionsLocalesPartner';
-import { PoleEmploiPartner } from '~/client/components/features/Partner/PoleEmploiPartner';
+import { ServiceCardList } from '~/client/components/features/ServiceCard/Card/ServiceCard';
+import { InfoJeunesPartner } from '~/client/components/features/ServiceCard/InfoJeunesPartner';
+import { MissionsLocalesPartner } from '~/client/components/features/ServiceCard/MissionsLocalesPartner';
+import { PoleEmploiPartner } from '~/client/components/features/ServiceCard/PoleEmploiPartner';
 import { Head } from '~/client/components/head/Head';
 import {
 	ListeRésultatsRechercherSolution,
@@ -120,11 +120,11 @@ export function RechercherAccompagnement() {
 					listeSolutionElement={<ListeÉtablissementAccompagnement résultatList={établissementAccompagnementList}/>}
 				/>
 				<EnTete heading="Découvrez d’autres services faits pour vous"/>
-				<PartnerCardList>
+				<ServiceCardList>
 					<MissionsLocalesPartner />
 					<InfoJeunesPartner />
 					<PoleEmploiPartner />
-				</PartnerCardList>
+				</ServiceCardList>
 			</main>
 		</>
 	);

diff --git a/src/client/components/features/Alternance/Rechercher/RechercherAlternance.tsx b/src/client/components/features/Alternance/Rechercher/RechercherAlternance.tsx
@@ -4,9 +4,10 @@ import React, { useEffect, useMemo, useState } from 'react';
 import {
 	FormulaireRechercheAlternance,
 } from '~/client/components/features/Alternance/FormulaireRecherche/FormulaireRechercheAlternance';
-import { PartnerCardList } from '~/client/components/features/Partner/Card/PartnerCard';
-import { OnisepPartner } from '~/client/components/features/Partner/OnisepPartner';
-import { PassPartner } from '~/client/components/features/Partner/PassPartner';
+import { ServiceCardList } from '~/client/components/features/ServiceCard/Card/ServiceCard';
+import { DecouvrirApprentissage } from '~/client/components/features/ServiceCard/DecouvrirApprentissage';
+import { OnisepPartner } from '~/client/components/features/ServiceCard/OnisepPartner';
+import { PassPartner } from '~/client/components/features/ServiceCard/PassPartner';
 import { Head } from '~/client/components/head/Head';
 import {
 	ListeRésultatsRechercherSolution,
@@ -131,10 +132,11 @@ export default function RechercherAlternance() {
 				</ArticleCard>
 			</ArticleCardList>
 			<EnTete heading="Découvrez des services faits pour vous"/>
-			<PartnerCardList>
+			<ServiceCardList>
+				<DecouvrirApprentissage/>
 				<PassPartner/>
 				<OnisepPartner/>
-			</PartnerCardList>
+			</ServiceCardList>
 		</main>
 	</>;
 }

diff --git a/...neApprentissageJeunes/EnSavoirPlusApprentissageJeunes/EnSavoirPlusApprentissageJeunes.tsx b/...neApprentissageJeunes/EnSavoirPlusApprentissageJeunes/EnSavoirPlusApprentissageJeunes.tsx
@@ -7,8 +7,8 @@ import styles from './EnSavoirPlusApprentissageJeunes.module.scss';
 export default function EnSavoirPlusApprentissageJeunes() {
 	return <Container className={styles.enSavoirPlus}>
 		<div className={styles.enSavoirPlusParents}>
-			<h2 className={styles.heading}>Parents : l’apprentissage, le bon choix pour votre enfant. <span
-				className={styles.headingSecondary}>On répond à toutes vos questions</span></h2>
+			<h2 className={styles.heading}>Parents : l’apprentissage, le bon choix pour votre enfant.
+				<span className={styles.headingSecondary}>On répond à toutes vos questions</span></h2>
 			<Link className={styles.link} href="/faq/apprentissage-parents-enfants" appearance="asPrimaryButton">
 				Accéder à la FAQ Parents-Enfants
 			</Link>

diff --git a/...tissage/CampagneApprentissageJeunes/PreparationApprentissage/PreparationApprentissage.tsx b/...tissage/CampagneApprentissageJeunes/PreparationApprentissage/PreparationApprentissage.tsx
@@ -8,12 +8,11 @@ import styles from './PreparationApprentissage.module.scss';
 
 export default function PreparationApprentissage() {
 	return (
-		<section
-			aria-labelledby={'titre-section-preparation-apprentissage'}
+		<div
 			className={styles.preparationApprentissage}>
 			<Container className={styles.contenu}>
-				<div className={styles.choixApprentissage}>
-					<h2 className={styles.titleChoixApprentissage} id={'titre-section-preparation-apprentissage'}>
+				<section className={styles.choixApprentissage} aria-labelledby={'titre-section-choix-apprentissage'}>
+					<h2 className={styles.titleChoixApprentissage} id={'titre-section-choix-apprentissage'}>
 						Vous souhaitez faire le choix de l’apprentissage ?
 					</h2>
 					<div className={styles.linkContainerChoixApprentissage}>
@@ -24,18 +23,18 @@ export default function PreparationApprentissage() {
 							Trouver votre entreprise
 						</Link>
 					</div>
-				</div>
-				<div className={styles.prepaApprentissage}>
-					<h2 className={styles.titlePrepaApprentissage} id={'titre-section-preparation-apprentissage'}>
+				</section>
+				<section className={styles.prepaApprentissage} aria-labelledby={'titre-section-prepa-apprentissage'}>
+					<h2 className={styles.titlePrepaApprentissage} id={'titre-section-prepa-apprentissage'}>
 						La prépa-apprentissage c’est quoi ?
 					</h2>
 					<Link
 						className={classNames(styles.linkPrepaApprentissage, styles.link)}
 						href={'/articles/la-prepa-apprentissage-c-est-quoi'}
 						appearance={'asPrimaryButton'}>
-							Lire l‘article
+						Lire l‘article
 					</Link>
-				</div>
+				</section>
 			</Container>
-		</section>);
+		</div>);
 }
diff --git a/src/client/components/features/Formation/Consulter/Statistiques/StatistiquesFormation.tsx b/src/client/components/features/Formation/Consulter/Statistiques/StatistiquesFormation.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { PartnerCard } from '~/client/components/features/Partner/Card/PartnerCard';
+import { ServiceCard } from '~/client/components/features/ServiceCard/Card/ServiceCard';
 import { Container } from '~/client/components/layouts/Container/Container';
 import {
 	ArticleCardList,
@@ -39,15 +39,15 @@ export function StatistiquesFormation({ statistiques }: { statistiques?: Statist
 					}
 				</article>
 				<ArticleCardList>
-					<PartnerCard
+					<ServiceCard
 						linkLabel="Lire l'article"
 						link="/articles/inserjeunes"
 						logo="/images/logos/inserjeunes.svg"
 						title="Découvrez le dispositif InserJeunes"
 						titleAs={'h3'}
 					>
 						Inserjeunes est un service d’aide à l’orientation des jeunes qui présente différents indicateurs pour toutes les formations professionnelles.
-					</PartnerCard>
+					</ServiceCard>
 				</ArticleCardList>
 			</Container>
 		</div>

diff --git a/src/client/components/features/Formation/Rechercher/RechercherFormation.test.tsx b/src/client/components/features/Formation/Rechercher/RechercherFormation.test.tsx
@@ -162,7 +162,7 @@ describe('RechercherFormation', () => {
 		expect(entête).toHaveTextContent('Découvrez des services faits pour vous');
 		expect(entête).toBeVisible();
 
-		const listeDePartenaires = screen.getByRole('list', { name: 'Liste des partenaires' });
+		const listeDePartenaires = screen.getByRole('list', { name: 'Liste des partenaires et des services' });
 		expect(listeDePartenaires).toBeVisible();
 	});
 

diff --git a/src/client/components/features/Formation/Rechercher/RechercherFormation.tsx b/src/client/components/features/Formation/Rechercher/RechercherFormation.tsx
@@ -6,11 +6,12 @@ import {
 	FormulaireRechercherFormation,
 } from '~/client/components/features/Formation/FormulaireRecherche/FormulaireRechercherFormation';
 import { ÉtiquettesFiltreFormation } from '~/client/components/features/Formation/Rechercher/ÉtiquettesFiltreFormation';
-import { PartnerCardList } from '~/client/components/features/Partner/Card/PartnerCard';
-import { MétierDuSoinPartner } from '~/client/components/features/Partner/MétiersDuSoinPartner';
-import { MonCompteFormationPartner } from '~/client/components/features/Partner/MonCompteFormationPartner';
-import { OnisepPartner } from '~/client/components/features/Partner/OnisepPartner';
-import { ParcourSupPartner } from '~/client/components/features/Partner/ParcourSupPartner';
+import { ServiceCardList } from '~/client/components/features/ServiceCard/Card/ServiceCard';
+import { DecouvrirApprentissage } from '~/client/components/features/ServiceCard/DecouvrirApprentissage';
+import { MétierDuSoinPartner } from '~/client/components/features/ServiceCard/MétiersDuSoinPartner';
+import { MonCompteFormationPartner } from '~/client/components/features/ServiceCard/MonCompteFormationPartner';
+import { OnisepPartner } from '~/client/components/features/ServiceCard/OnisepPartner';
+import { ParcourSupPartner } from '~/client/components/features/ServiceCard/ParcourSupPartner';
 import { Head } from '~/client/components/head/Head';
 import {
 	ListeRésultatsRechercherSolution,
@@ -104,12 +105,13 @@ export default function RechercherFormation() {
 				}
 			/>
 			<EnTete heading="Découvrez des services faits pour vous"/>
-			<PartnerCardList>
+			<ServiceCardList>
+				<DecouvrirApprentissage/>
 				<MonCompteFormationPartner/>
 				<ParcourSupPartner/>
 				<OnisepPartner/>
 				<MétierDuSoinPartner/>
-			</PartnerCardList>
+			</ServiceCardList>
 		</main>
 	</>;
 }

diff --git a/src/client/components/features/JobÉtudiant/Rechercher/RechercherJobÉtudiant.tsx b/src/client/components/features/JobÉtudiant/Rechercher/RechercherJobÉtudiant.tsx
@@ -3,10 +3,10 @@ import React, { useEffect, useMemo, useState } from 'react';
 import {
 	FormulaireRechercheJobÉtudiant,
 } from '~/client/components/features/JobÉtudiant/FormulaireRecherche/FormulaireRechercheJobÉtudiant';
-import { PartnerCardList } from '~/client/components/features/Partner/Card/PartnerCard';
-import { LaBonneBoitePartner } from '~/client/components/features/Partner/LaBonneBoitePartner';
-import { OnisepPartner } from '~/client/components/features/Partner/OnisepPartner';
-import { ServiceCiviquePartner } from '~/client/components/features/Partner/ServiceCiviquePartner';
+import { ServiceCardList } from '~/client/components/features/ServiceCard/Card/ServiceCard';
+import { LaBonneBoitePartner } from '~/client/components/features/ServiceCard/LaBonneBoitePartner';
+import { OnisepPartner } from '~/client/components/features/ServiceCard/OnisepPartner';
+import { ServiceCiviquePartner } from '~/client/components/features/ServiceCard/ServiceCiviquePartner';
 import { Head } from '~/client/components/head/Head';
 import {
 	ListeRésultatsRechercherSolution,
@@ -101,11 +101,11 @@ export function RechercherJobÉtudiant() {
 					listeSolutionElement={<ListeOffreJobÉtudiant résultatList={jobÉtudiantList}/>}
 				/>
 				<EnTete heading="Découvrez des services faits pour vous" />
-				<PartnerCardList>
+				<ServiceCardList>
 					<LaBonneBoitePartner />
 					<OnisepPartner />
 					<ServiceCiviquePartner />
-				</PartnerCardList>
+				</ServiceCardList>
 			</main>
 		</>
 	);

diff --git a/src/client/components/features/OffreEmploi/Rechercher/RechercherOffreEmploi.tsx b/src/client/components/features/OffreEmploi/Rechercher/RechercherOffreEmploi.tsx
@@ -6,10 +6,10 @@ import {
 import {
 	ÉtiquettesFiltreOffreEmploi,
 } from '~/client/components/features/OffreEmploi/Rechercher/ÉtiquettesFiltreOffreEmploi';
-import { PartnerCardList } from '~/client/components/features/Partner/Card/PartnerCard';
-import { LaBonneBoitePartner } from '~/client/components/features/Partner/LaBonneBoitePartner';
-import { OnisepPartner } from '~/client/components/features/Partner/OnisepPartner';
-import { ServiceCiviquePartner } from '~/client/components/features/Partner/ServiceCiviquePartner';
+import { ServiceCardList } from '~/client/components/features/ServiceCard/Card/ServiceCard';
+import { LaBonneBoitePartner } from '~/client/components/features/ServiceCard/LaBonneBoitePartner';
+import { OnisepPartner } from '~/client/components/features/ServiceCard/OnisepPartner';
+import { ServiceCiviquePartner } from '~/client/components/features/ServiceCard/ServiceCiviquePartner';
 import { Head } from '~/client/components/head/Head';
 import {
 	ListeRésultatsRechercherSolution,
@@ -95,11 +95,11 @@ export function RechercherOffreEmploi() {
 					listeSolutionElement={<ListeOffreEmploi résultatList={offreEmploiList}/>}
 				/>
 				<EnTete heading="Découvrez des services faits pour vous"/>
-				<PartnerCardList>
+				<ServiceCardList>
 					<LaBonneBoitePartner/>
 					<OnisepPartner/>
 					<ServiceCiviquePartner/>
-				</PartnerCardList>
+				</ServiceCardList>
 			</main>
 		</>
 	);

diff --git a/src/client/components/features/Partner/Card/PartnerCard.module.scss b/src/client/components/features/Partner/Card/PartnerCard.module.scss
diff --git a/src/client/components/features/Partner/SimulationAlternancePartner.tsx b/src/client/components/features/Partner/SimulationAlternancePartner.tsx