Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
May 4, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/components/features/Accompagnement/Rechercher/RechercherAccompagnement.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 6 additions & 6 deletions src/client/components/features/Accompagnement/Rechercher/RechercherAccompagnement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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>
</>
);
Expand Down
12 changes: 7 additions & 5 deletions src/client/components/features/Alternance/Rechercher/RechercherAlternance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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>
</>;
}
Expand Down
4 changes: 2 additions & 2 deletions ...neApprentissageJeunes/EnSavoirPlusApprentissageJeunes/EnSavoirPlusApprentissageJeunes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 9 additions & 10 deletions ...tissage/CampagneApprentissageJeunes/PreparationApprentissage/PreparationApprentissage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}>
Expand All @@ -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'}>
juliebrunetto83 marked this conversation as resolved.
Show resolved Hide resolved
</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>);
}
6 changes: 3 additions & 3 deletions src/client/components/features/Formation/Consulter/Statistiques/StatistiquesFormation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/client/components/features/Formation/Rechercher/RechercherFormation.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand Down
16 changes: 9 additions & 7 deletions src/client/components/features/Formation/Rechercher/RechercherFormation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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>
</>;
}
Expand Down
12 changes: 6 additions & 6 deletions src/client/components/features/JobÉtudiant/Rechercher/RechercherJobÉtudiant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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>
</>
);
Expand Down
12 changes: 6 additions & 6 deletions src/client/components/features/OffreEmploi/Rechercher/RechercherOffreEmploi.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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>
</>
);
Expand Down
89 changes: 0 additions & 89 deletions src/client/components/features/Partner/Card/PartnerCard.module.scss
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions src/client/components/features/Partner/SimulationAlternancePartner.tsx
View file
Open in desktop

This file was deleted.

Loading