Skip to content

Commit

Permalink
V3 master (#483)
Browse files Browse the repository at this point in the history
* V3 develop (#468)

* update yarn.lock

* Fix/buttons title (#454)

* fix: button titles

* feat: add alt

* fix: download button to link

* feat:upgrade lunatic-dsfr

* fix-frozen-lock-file

* fix/version-number

* fix?

* fix??

* fix:focus-on-precedent

* fix error checkbox, radio

* Update test.yml

* Update test.yml

* fix??

* fix: babel core

* fix

* Update test.yml

* Update test.yml

* try without lock

* Update test.yml

* Update test.yml

* try to rollback lunatic-dsfr

* lunatic-dsfr is not the problem

* Update test.yml

* Update test.yml

* Update test.yml

* Update test.yml

* roll-back-test

* fix:fontweight

---------

Co-authored-by: Julia Dirand <[email protected]>

* remove component AlertControl (#465)

* Fix infinite loop when no surveyunit data (#466)

fix: remove setter in useEffect

* Fix/v3 redirect new user (#464)

* redirect new user after login to root url

* remove .env spécific conf

* Fix html validation (#460)

* fix: span to p

* fix p in double

* feat:add missing classname

* fix after review

* fix-download-link

* type for converContent

---------

Co-authored-by: Julia Dirand <[email protected]>
Co-authored-by: Renaud Genevois <[email protected]>

* fix: esling-and-upgrad-lunatic-dsfr

* Revert "Fix infinite loop when no surveyunit data" (#471)

Revert "Fix infinite loop when no surveyunit data (#466)"

This reverts commit cd28d59.

* refactor use lunatic components (#467)

feat: autofocus first field

* feat: add focus on continue button if coming from the cancel buttons … (#473)

* feat: add focus on continue button if coming from the cancel buttons on the modal

* yarn remove workers

---------

Co-authored-by: Julia Dirand <[email protected]>

* feat: add new env variable (REACT_APP_VIZUALIZE_ENABLED) (false by default)

* feat: enable Visualize page only if VIZUALIZE_ENABLED =true

* chore: remove useless env variables

* fix-lunatic

* yarn-lock

* Fix/v3 use saving (#476)

* init useSaving instead of Savecomponent

* save in useSaving

* drafbanner duration

* fix:security-link-with-target-blank

* fix:Link

* display alert controls just for roundabout (#479)

Co-authored-by: Renaud Genevois <[email protected]>

* use getData to collect lunatic value (#477)

* use getData to collect lunatic value

* feat:upgrade lunatic

* feat:add-debug-option

* fix: alerte and upgrade lunatic

---------

Co-authored-by: Julia Dirand <[email protected]>

---------

Co-authored-by: Renaud Genevois <[email protected]>
Co-authored-by: Julia Dirand <[email protected]>
Co-authored-by: Renaud Genevois <[email protected]>
Co-authored-by: Jonathan <[email protected]>
Co-authored-by: Laurent Caouissin <[email protected]>
Co-authored-by: Laurent Caouissin <[email protected]>

* fix:pairwise-style

* fix:lunatic-dsfr-modal-html

* upgrade lunatic dsfr

* upgrade-lunatic-dsfr-to-13

---------

Co-authored-by: Renaud Genevois <[email protected]>
Co-authored-by: Julia Dirand <[email protected]>
Co-authored-by: Renaud Genevois <[email protected]>
Co-authored-by: Jonathan <[email protected]>
Co-authored-by: Laurent Caouissin <[email protected]>
Co-authored-by: Laurent Caouissin <[email protected]>
  • Loading branch information
7 people authored Nov 23, 2023
1 parent 8157666 commit 24160b7
Show file tree
Hide file tree
Showing 4 changed files with 192 additions and 181 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@inseefr/lunatic": "2.6.7",
"@inseefr/lunatic-dsfr": "1.0.10",
"@inseefr/lunatic-dsfr": "1.0.13",
"@mui/material": "^5.11.8",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
Expand Down
24 changes: 15 additions & 9 deletions src/components/formulaire/Formulaire.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ const useStyles = makeStyles()({
".lunatic-component-with-dsfr": {
"marginBottom": "1rem",
".fr-fieldset, .fr-fieldset__element": {
marginBottom: 0,
marginBottom: 0
},
".pairwise-link": {
marginBottom: "1rem"
},
"input[aria-describedby^='autre-link']": {
marginBottom:"1rem"
},
"legend": {
fontSize: "1.75rem",
Expand Down Expand Up @@ -50,17 +56,17 @@ const useStyles = makeStyles()({
},
},
".lunatic-dsfr-component-set": {
"marginBottom": "1rem",
"display": "grid",
"grid-template-columns": "1fr",
"gap": "1rem",
marginBottom: "1rem",
display: "grid",
gridTemplateColumns: "1fr",
gap: "1rem",
".fr-callout": {
"marginBottom": "0",
marginBottom: "0",
},
".lunatic-dsfr-component-set": {
"display": "grid",
"grid-template-columns": "1fr",
"gap": "1rem",
display: "grid",
gridTemplateColumns: "1fr",
gap: "1rem",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/utils/read-env-vars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ export const environment = {
AUTH_TYPE: getEnvVar('REACT_APP_AUTH_TYPE') || AuthTypeEnum.None,
// VISUALIZE is disabled by default, so if value is not present and not set to true in env-config.js, VISUALIZE page is disabled
VIZUALIZE_ENABLED: getEnvVar('REACT_APP_VIZUALIZE_ENABLED') || false,
DEBUG: Boolean(getEnvVar('REACT_APP_DEBUG') === 'true'),
DEBUG: Boolean(getEnvVar('REACT_APP_DEBUG') || false)
};
Loading

0 comments on commit 24160b7

Please sign in to comment.