Skip to content

Commit

Permalink
Merge branch 'dev' into persist-indemnite
Browse files Browse the repository at this point in the history
  • Loading branch information
maxgfr committed Aug 24, 2023
2 parents e16cb69 + e8b7e41 commit ba0f184
Show file tree
Hide file tree
Showing 109 changed files with 1,416 additions and 578 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,26 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.106.0](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.105.1...v4.106.0) (2023-08-09)

### Bug Fixes

- **affichage des cc:** quand une cc est inconnue sur une entreprise ([#5284](https://github.com/SocialGouv/code-du-travail-numerique/issues/5284)) ([99aa96c](https://github.com/SocialGouv/code-du-travail-numerique/commit/99aa96ccf6799b5b419013725093fcee12e031e9))
- **e2e:** change date for indemnite-licenciement ([9f55dde](https://github.com/SocialGouv/code-du-travail-numerique/commit/9f55dde1808c76a91973fc05c9e7348e60562c79))
- **events:** refactor `pushAgreements` ([#5302](https://github.com/SocialGouv/code-du-travail-numerique/issues/5302)) ([7119a85](https://github.com/SocialGouv/code-du-travail-numerique/commit/7119a85d8aad97d00b3fe3b076d1ce97b459a3e1))
- **indemite-licenciement:** modification de la margin du questionnaire a la premiere etape ([3f74e61](https://github.com/SocialGouv/code-du-travail-numerique/commit/3f74e61e4935eb6c1c5c793d26eea4e8a2ed5097))
- **indemnite-licenciement:** cc 2148 majoration ([#5283](https://github.com/SocialGouv/code-du-travail-numerique/issues/5283)) ([6078aaa](https://github.com/SocialGouv/code-du-travail-numerique/commit/6078aaa9e19917ec37e511ad7fb509b4294808ee))
- **modeles:** modification des disclaimers et des titres ([#5299](https://github.com/SocialGouv/code-du-travail-numerique/issues/5299)) ([61f06b3](https://github.com/SocialGouv/code-du-travail-numerique/commit/61f06b3fc70ce574c5f6abaeac18969cd22f07da))

### Features

- 5271 indemnité de licenciement créer un questionnaire spécifique ([#5287](https://github.com/SocialGouv/code-du-travail-numerique/issues/5287)) ([969c330](https://github.com/SocialGouv/code-du-travail-numerique/commit/969c330a99e7f027775578ffbbc6e17cdd58fa92))
- **accessibilité:** mise à jour de la page accessibilité ([#5295](https://github.com/SocialGouv/code-du-travail-numerique/issues/5295)) ([399b2e7](https://github.com/SocialGouv/code-du-travail-numerique/commit/399b2e7d6501f96b40f1bca38c245e0eab367658))
- add redirection ([#5307](https://github.com/SocialGouv/code-du-travail-numerique/issues/5307)) ([a0941c8](https://github.com/SocialGouv/code-du-travail-numerique/commit/a0941c8ba87d26257f8ffdfcc690f577a1202f16))
- **contributions:** nouvelle version pages personnalisables ([#5280](https://github.com/SocialGouv/code-du-travail-numerique/issues/5280)) ([1ba1342](https://github.com/SocialGouv/code-du-travail-numerique/commit/1ba134214330a469588e4ad5bd2b7bf62ff3cd00))
- indemnite licenciement 176 ([#5234](https://github.com/SocialGouv/code-du-travail-numerique/issues/5234)) ([d803a58](https://github.com/SocialGouv/code-du-travail-numerique/commit/d803a582db59c9e644db94b9c6c4afbd1624da9e))
- **indemnite-licenciement:** activation de nouvelles CC ([#5300](https://github.com/SocialGouv/code-du-travail-numerique/issues/5300)) ([8c513d5](https://github.com/SocialGouv/code-du-travail-numerique/commit/8c513d56a7562ddb4a48e4c6bba356353181e840))

## [4.105.1](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.105.0...v4.105.1) (2023-07-19)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
},
"npmClient": "yarn",
"useWorkspaces": true,
"version": "4.105.1"
"version": "4.106.0"
}
18 changes: 18 additions & 0 deletions packages/code-du-travail-frontend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.106.0](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.105.1...v4.106.0) (2023-08-09)

### Bug Fixes

- **affichage des cc:** quand une cc est inconnue sur une entreprise ([#5284](https://github.com/SocialGouv/code-du-travail-numerique/issues/5284)) ([99aa96c](https://github.com/SocialGouv/code-du-travail-numerique/commit/99aa96ccf6799b5b419013725093fcee12e031e9))
- **e2e:** change date for indemnite-licenciement ([9f55dde](https://github.com/SocialGouv/code-du-travail-numerique/commit/9f55dde1808c76a91973fc05c9e7348e60562c79))
- **events:** refactor `pushAgreements` ([#5302](https://github.com/SocialGouv/code-du-travail-numerique/issues/5302)) ([7119a85](https://github.com/SocialGouv/code-du-travail-numerique/commit/7119a85d8aad97d00b3fe3b076d1ce97b459a3e1))
- **indemite-licenciement:** modification de la margin du questionnaire a la premiere etape ([3f74e61](https://github.com/SocialGouv/code-du-travail-numerique/commit/3f74e61e4935eb6c1c5c793d26eea4e8a2ed5097))
- **modeles:** modification des disclaimers et des titres ([#5299](https://github.com/SocialGouv/code-du-travail-numerique/issues/5299)) ([61f06b3](https://github.com/SocialGouv/code-du-travail-numerique/commit/61f06b3fc70ce574c5f6abaeac18969cd22f07da))

### Features

- 5271 indemnité de licenciement créer un questionnaire spécifique ([#5287](https://github.com/SocialGouv/code-du-travail-numerique/issues/5287)) ([969c330](https://github.com/SocialGouv/code-du-travail-numerique/commit/969c330a99e7f027775578ffbbc6e17cdd58fa92))
- **accessibilité:** mise à jour de la page accessibilité ([#5295](https://github.com/SocialGouv/code-du-travail-numerique/issues/5295)) ([399b2e7](https://github.com/SocialGouv/code-du-travail-numerique/commit/399b2e7d6501f96b40f1bca38c245e0eab367658))
- add redirection ([#5307](https://github.com/SocialGouv/code-du-travail-numerique/issues/5307)) ([a0941c8](https://github.com/SocialGouv/code-du-travail-numerique/commit/a0941c8ba87d26257f8ffdfcc690f577a1202f16))
- **contributions:** nouvelle version pages personnalisables ([#5280](https://github.com/SocialGouv/code-du-travail-numerique/issues/5280)) ([1ba1342](https://github.com/SocialGouv/code-du-travail-numerique/commit/1ba134214330a469588e4ad5bd2b7bf62ff3cd00))
- indemnite licenciement 176 ([#5234](https://github.com/SocialGouv/code-du-travail-numerique/issues/5234)) ([d803a58](https://github.com/SocialGouv/code-du-travail-numerique/commit/d803a582db59c9e644db94b9c6c4afbd1624da9e))

## [4.105.1](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.105.0...v4.105.1) (2023-07-19)

### Bug Fixes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@ exports[`<FicheMT /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Facebook
</span>
</span>
</button>
<a
Expand All @@ -308,6 +313,11 @@ exports[`<FicheMT /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Courriel
</span>
</span>
</a>
<button
Expand All @@ -329,6 +339,11 @@ exports[`<FicheMT /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Linkedin
</span>
</span>
</button>
<div
Expand Down Expand Up @@ -363,6 +378,11 @@ exports[`<FicheMT /> should render 1`] = `
stroke-width="1.5"
/>
</svg>
<span
class="sr-only"
>
Partage
</span>
</span>
</button>
</div>
Expand Down Expand Up @@ -588,6 +608,11 @@ exports[`<FicheMT /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Facebook
</span>
</span>
</button>
<a
Expand All @@ -614,6 +639,11 @@ exports[`<FicheMT /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Courriel
</span>
</span>
</a>
<button
Expand All @@ -635,6 +665,11 @@ exports[`<FicheMT /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Linkedin
</span>
</span>
</button>
<div
Expand Down Expand Up @@ -669,6 +704,11 @@ exports[`<FicheMT /> should render 1`] = `
stroke-width="1.5"
/>
</svg>
<span
class="sr-only"
>
Partage
</span>
</span>
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Facebook
</span>
</span>
</button>
<a
Expand All @@ -308,6 +313,11 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Courriel
</span>
</span>
</a>
<button
Expand All @@ -329,6 +339,11 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Linkedin
</span>
</span>
</button>
<div
Expand Down Expand Up @@ -363,6 +378,11 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
stroke-width="1.5"
/>
</svg>
<span
class="sr-only"
>
Partage
</span>
</span>
</button>
</div>
Expand Down Expand Up @@ -569,6 +589,11 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Facebook
</span>
</span>
</button>
<a
Expand All @@ -595,6 +620,11 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Courriel
</span>
</span>
</a>
<button
Expand All @@ -616,6 +646,11 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
fill="currentColor"
/>
</svg>
<span
class="sr-only"
>
Linkedin
</span>
</span>
</button>
<div
Expand Down Expand Up @@ -650,6 +685,11 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
stroke-width="1.5"
/>
</svg>
<span
class="sr-only"
>
Partage
</span>
</span>
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/code-du-travail-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cdt/frontend",
"version": "4.105.1",
"version": "4.106.0",
"description": "Code du travail frontend",
"private": true,
"homepage": "https://code-du-travail.beta.gouv.fr/",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
.checklist { list-style-image: url(data:image/svg+xml;,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%221rem%22%20height%3D%221rem%22%20viewBox%3D%220%200%2011%2011%22%3E%3Cpath%20fill%3D%22currentColor%22%20d%3D%22M2%202h10v10H2z%22%2F%3E%3Cpath%20fill%3D%22%23fff%22%20stroke%3D%22currentColor%22%20stroke-width%3D%22.5%22%20d%3D%22M1%201h9v9H1z%22%2F%3E%3C%2Fsvg%3E);}
.editable {color: var(--color-secondary)}
.options {font-style: italic; color: var(--color-altText)}
.sr-only{display: none;}
10 changes: 10 additions & 0 deletions packages/code-du-travail-frontend/redirects.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,15 @@
"source": "/convention-collective/1740-:slug",
"permanent": true,
"destination": "/outils/convention-collective"
},
{
"source": "/fiche-service-public/peut-on-percevoir-lallocation-chomage-en-cas-de-demission",
"permanent": true,
"destination": "/fiche-service-public/un-salarie-peut-il-toucher-lallocation-chomage-en-cas-de-demission"
},
{
"source": "/fiche-service-public/regles-de-licenciement-dans-une-entreprise-en-difficulte",
"permanent": true,
"destination": "/fiche-service-public/licenciement-dans-une-entreprise-en-difficulte-quelles-sont-les-regles"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`<ReferencesJuridiques /> should render 1`] = `
<button
aria-expanded="false"
class="sc-kOPcWz ezOCpB sc-bbSZdi klJhHR"
tabindex="1"
type="button"
>
<svg
Expand Down
4 changes: 4 additions & 0 deletions packages/code-du-travail-frontend/src/common/Share.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export const Share = ({ title, metaDescription }: Props): JSX.Element => {
>
<Circle>
<StyledIcon as={icons.ShareFacebook} />
<span className="sr-only">Facebook</span>
</Circle>
</StyledButton>
<StyledLink
Expand All @@ -57,6 +58,7 @@ export const Share = ({ title, metaDescription }: Props): JSX.Element => {
>
<Circle>
<StyledIcon as={icons.Mail} />
<span className="sr-only">Courriel</span>
</Circle>
</StyledLink>
<StyledButton
Expand All @@ -75,6 +77,7 @@ export const Share = ({ title, metaDescription }: Props): JSX.Element => {
>
<Circle>
<StyledIcon as={icons.ShareLinkedin} />
<span className="sr-only">Linkedin</span>
</Circle>
</StyledButton>
<Dropdown
Expand Down Expand Up @@ -105,6 +108,7 @@ export const Share = ({ title, metaDescription }: Props): JSX.Element => {
>
<Circle>
<StyledIcon as={icons.Share} />
<span className="sr-only">Partage</span>
</Circle>
</StyledButton>
)}
Expand Down
Loading

0 comments on commit ba0f184

Please sign in to comment.