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.

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(contribution): passage au DSFR #6428

Merged
merged 282 commits into from
Jan 30, 2025
Merged

feat(contribution): passage au DSFR #6428

merged 282 commits into from
Jan 30, 2025

Conversation

carolineBda
Copy link
Contributor

@carolineBda carolineBda commented Jan 21, 2025

Co-authored-by: @Viczei

Ne pas oublié de merger cette branch en même temps : SocialGouv/cdtn-admin#1530

m-maillot and others added 30 commits September 5, 2024 10:39
* fix: tests

* fix: tests

* fix: command

* fix: merge date

* fix: tests

* fix: tests

* fix: tests

* fix: tests
* feat: implémentation page politique confidentialité dsfr

* chore: clean

* fix: iframe dark mode

* chore: refacto + e2e test

* feat: convert a to Link

* chore: review

* chore: rename test

---------

Co-authored-by: victor <[email protected]>
…question" (#6121)

* fix: merge date

* fix: satisfaction

* fix: retours preavis

* fix: retours preavis

* fix: tests

* move feedback component to the page articleCodeDuTravail.tsx

* clean-up css

* fix: feedback

* fix: feedback

* fix: tests

* fix: tests

* feat(dsfr): création du composant "Besoin de plus d'information" (#6135)

* fix: ui

* fix: composant

---------

Co-authored-by: carolineBda <[email protected]>
Co-authored-by: Martial Maillot <[email protected]>
* fix: matomo

* fix: matomo

---------

Co-authored-by: Martial Maillot <[email protected]>
* fix: tests

* feat: limiter à 500 caractères la saisie

* feat: limiter à 500 caractères la saisie

---------

Co-authored-by: Martial Maillot <[email protected]>
* fix: pages

* fix: 404

* fix: tests

* fix: tests

* fix: tests

* fix: lint

* test error

* fix errors

* Fix spec

* add button to test error page

* feat: force error 500 for testing purpose

* feat: revert errors

---------

Co-authored-by: carolineBda <[email protected]>
Co-authored-by: Martial Maillot <[email protected]>
@@ -16,6 +16,8 @@ export const localConfig: ConfigData = {
"no-dup-id": "off",
"wcag/h63": "off",
"wcag/h32": "off",
"no-redundant-role": "off",
"no-missing-references": "off",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@m-maillot quand t'aura fixé la RGAA sur la combobox on pourra retirer ces 2 exclusions

cy.urlEqual(
"/convention-collective/2941-aide-accompagnement-soins-et-services-a-domicile-bad"
"/contribution/2941-quelles-sont-les-conditions-dindemnisation-pendant-le-conge-de-maternite"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

je ne comprends pas comment ça passait avant mais on clique bien sur une contrib donc on doit arriver sur une contrib

@@ -8,7 +8,7 @@ import { FooterBottom } from "./FooterBottom";

export const Footer = () => {
return (
<footer role="contentinfo">
<footer>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

j'ai enlevé ça ça faisait une erreur dans le test validate-html. J'ai suivi la recommandation ici "This is a website footer. Using the

element instead is recommended:"

@@ -13,9 +13,8 @@ export const localConfig: ConfigData = {
"aria-label-misuse": "off",
"long-title": "off",
"script-type": "off",
"no-dup-id": "off",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

j'ai remis ces règles parcequ'elles sont maintenant valides

@Viczei Viczei merged commit 04ed765 into dev Jan 30, 2025
22 of 23 checks passed
@Viczei Viczei deleted the linked/contribution-dsfr branch January 30, 2025 16:45
@maxgfr maxgfr removed their request for review February 1, 2025 20:16
carolineBda added a commit that referenced this pull request Feb 3, 2025
* chore(dsfr): mise à jour de la version DSFR

* fix(dsfr): ignore les exceptions d'hydratation

* feat(tests): ajout du module de testing (#6096)

* fix: tests

* fix: tests

* fix: command

* fix: merge date

* fix: tests

* fix: tests

* fix: tests

* fix: tests

* fix(dsfr): ignore les exceptions d'hydratation

* fix: readme

* feat(DSFR): migration de la page article du code du travail (#6099)

* feat: 6093 dsfr page politique de confidentialit (#6094)

* feat: implémentation page politique confidentialité dsfr

* chore: clean

* fix: iframe dark mode

* chore: refacto + e2e test

* feat: convert a to Link

* chore: review

* chore: rename test

---------

Co-authored-by: victor <[email protected]>

* feat(dsfr): ajout des liens d'évitement (#6120)

* feat(dsfr): migration de la page plan du site (#6097)

* feat(dsfr): mise à jour des snapshots

* feat(dsfr): mise à jour des snapshots

* chore(dsfr): mise à jour de la lib DSFR

* feat(dsfr): ajout du composant "Avez-vous trouvé une réponse à votre question" (#6121)

* fix: merge date

* fix: satisfaction

* fix: retours preavis

* fix: retours preavis

* fix: tests

* move feedback component to the page articleCodeDuTravail.tsx

* clean-up css

* fix: feedback

* fix: feedback

* fix: tests

* fix: tests

* feat(dsfr): création du composant "Besoin de plus d'information" (#6135)

* fix: ui

* fix: composant

---------

Co-authored-by: carolineBda <[email protected]>
Co-authored-by: Martial Maillot <[email protected]>

* fix: retours

* fix: tests

* feat: nouvelle API pour les articles du code du travail (#6132)

Co-authored-by: carolineBda <[email protected]>

* fix(spec) : fix de la spec article-code-du-travail.spec.ts

* fix(dsfr): ajout de la config pour supprimer le `insafe-inline` des `scripts` dans les `csp` (#6151)

* feat(dsfr): ajout de matomo pour tracker les events (#6157)

* fix: matomo

* fix: matomo

---------

Co-authored-by: Martial Maillot <[email protected]>

* fix(feedback): ajout d'une logique de caractères restants (#6156)

* fix: tests

* feat: limiter à 500 caractères la saisie

* feat: limiter à 500 caractères la saisie

---------

Co-authored-by: Martial Maillot <[email protected]>

* feat(dsfr): ajout du nouveau logo (#6159)

* feat(dsfr): ajout des pages d'erreurs (404 + 500) (#6146)

* fix: pages

* fix: 404

* fix: tests

* fix: tests

* fix: tests

* fix: lint

* test error

* fix errors

* Fix spec

* add button to test error page

* feat: force error 500 for testing purpose

* feat: revert errors

---------

Co-authored-by: carolineBda <[email protected]>
Co-authored-by: Martial Maillot <[email protected]>

* feat: séparation des anciennes API et des nouvelles (#6183)

* fix(article code du travail): retrait du tag Code du travail (#6182)

* feat(config): correction de `husky`, ajout de `prettier` pour le formattage et de `lint-staged` pour runner le formattage au `precommit` (#6192)

* fix: prettier

* fix: prettier

* fix: readme

* fix: readme

* fix: bug

* fix: prettier

* fix: prettier

* fix: tests

* fix: tests

* fix: prettier

* fix: prettier

* fix: branch

* merge dev

* feat: implémentation simulateur brut net

* chore: fix ts

* chore: snap

* chore: clean

* chore: clean

* chore: clean

* chore: review

* feat: update responsive

* Revert "Merge branch 'dev' into simulateur-brut-net-dsfr"

This reverts commit 0748928, reversing
changes made to cd15bc7.

* chore: clean

* feat: chore clean

* chore: clean

* chore: remove undesired files

* chore: remove undesired files

* chore: clean

* feat: implementation page convention collective

* feat: update button link

* fix: meta description share

* feat: switch simu brut net couleur par defaut

* feat: ajout de l'icone

* feat: update svg

* fix: ts

* fix: bug load

* chore: review

* fix: mobile display

* chore: review

* chore: review

* chore: review

* feat: implémentation trouver cc

* feat: implementation trouver CC

* chore: common style

* feat: add error alert entreprise search

* feat: disable card

* feat: ajout TU + fix

* chore: clean

* fix: e2e tests

* chore: clean

* feat: implementation contribution dsfr

* fix: widget

* fix: error

* feat: info bulle

* fix: widget

* fix: home fetch agreement

* feat: add postmessage searchCC

* fix: home cc

* feat: change contenu lié search cc

* fix: related items

* fix: message erreur lors de la recherche

* fix: error message

* fix: relatedItems

* chore: add TU

* refactor: move files to folders

* fix: build

* chore: review

* chore: clean

* fix: ajout des canonicals

* fix: input info

* fix: canonicals

* feat: ajout d'un spinner

* fix: tests

* chore: review

* feat: add spinner to enterprise search

* feat: contribution search cc

* refactor: queries

* fix: load on select item autocomplete

* fix: bug widget selection entreprise

* feat: implement alert message

* fix: disabled rule

* feat: localstorage

* chore: review

* chore: review

* chore: review

* chore: review

* chore: review

* chore: review

* feat: implement content

* chore: review

* fix: garder la recherche entrerprise au click precedent

* chore: review

* chore: review

* fix: TU + some styles

* fix: e2e

* refactor

* fix: TU

* fix: TU

* chore: review

* chore: review

* chore: review

* chore: review postalcode

* chore: review

* chore: review

* fix: cypress test

* chore: add widgetMode TU

* chore: fix test

* fix: cypress test

* fix: cypress test

* feat: implement

* chore: cy

* chore: fix cy

* refactor

* refactor

* chore: review

* chore: clean

* chore: review

* fix: largeur champs recherche entreprise

* feat: ajout d'un message d'erreur pour les codes naf

* feat: update design

* chore: clean

* feat: implement

* chore: design review

* chore: review

* chore: test noindex

* chore: nbsp

* chore: review

* chore: review

* chore: fix test e2e

* fix: previous

* feat: implement input CC search form

* fix: design

* chore: clean

* feat: ajout du localstorage

* fix: bug recherche cc selectionne

* fix: don't set cc for enterprise form

* fix: localstorage wrong load

* feat: add alert on CC select

* fix: localstorage preload

* fix: wrong slug

* fix: goBack not removing cc

* chore: review

* chore: review

* chore: TU

* feat: add fiche SP

* fix: design

* feat: tracking

* chore: TU fix

* fix: cc entreprise select

* feat: add tracking on radio agreement select

* chore: tracking p1 et p2

* fix: doublon tracking

* chore: snap

* chore: review

* fix: tracking event enterprise

* fix: TU

* fix: emit tracking enterprise recherche CC

* chore: add TU tracking

* feat: mise à jour design

* fix(contributions): affichage du nom de la CC dans le H1 des contribs personnalisées (#6399)

* fix: CC non traité message

* fix: merge

* refactor: contribution generic specific (#6421)

* fix: texte CC non traité

* refactor: division en plusieurs fichiers

* refactor: typage

* feat: ajout cas tests & correction message erreur cc non traité no CDT

* chore: rename TU

* feat: add TU non treated info description

* fix: bug display 0 in middle of contribution

* fix: design

* chore: TU on 3239

* fix: TU

* chore: review

* fix: accordion collapse on anchor

* fix: id no string

* fix: broken link

* fix: message warning non-treated agreement

* fix: TU

* fix: cc e2e tests

* fix: accordion id

* chore: review

* chore: review

* fix: regression number cc search

* fix: localstorage

* fix: review

* refactor: isAgreementValid

* chore: revert e2e deleted

* refactor: clean

---------

Co-authored-by: victor <[email protected]>

* clean

* clean

* fix: add TU contribution content

* fix: localstorage for enterprise search & noCdt description

* refactor: localstorage

* fix: margin references

* fix: tracking on display button click

* fix: radio unchecked by default

* fix: localstorage should select radio

* fix: design

* fix: date mise à jour fiche SP

* chore: add localstorage tests

* refactor: localstorage should not send events

* chore: snap

* fix: review metier

* fix: review code

* fix: review code

* refactor: use common link

* chore: snap

* clean up

* fix url widget

* lint

* remove text when no CDT

* fix related items

* clean up types

* try to fix spec

* fix spec

* fix snapshot

* fix lien widget !

* add rules that are now valid

* fix

* feat: scroll to enterprise on selection

* fix: TU

* fix: scroll agreement modify

* fix: list bullet truncate

* fix: TU

---------

Co-authored-by: Martial Maillot <[email protected]>
Co-authored-by: Maxime Golfier <[email protected]>
Co-authored-by: Victor Zeinstra <[email protected]>
Co-authored-by: victor <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants