Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@alebret
alebret committed Sep 17, 2021
2 parents 3f41d13 + 40c3a66 commit 8affa2c
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 136 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@dataesr/react-dsfr": "^0.5.5",
"bootstrap": "^4.6.0",
"graphql": "^15.5.1",
"next": "^11.0.0",
"next": "^11.1.1",
"next-i18next": "^8.5.5",
"react": "17.0.2",
"react-bootstrap": "^1.5.2",
Expand All @@ -42,4 +42,4 @@
"@socialgouv/eslint-config-react"
]
}
}
}
1 change: 0 additions & 1 deletion pages/questionnaire-epds.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ const ComprendreTestStyle = () => (
.questionnaire {
margin-top: 20px;
font-style: italic;
font-size: 13px;
}
.questionnaire-buttons {
Expand Down
10 changes: 3 additions & 7 deletions pages/resultats.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ export default function Resultats() {
<FormContact translation={t} />

<Col>
<p className="font-weight-bold resultats-text">{t("invitation-a-refaire")}</p>
<p className="font-weight-bold">{t("invitation-a-refaire")}</p>
<p>
<span className="font-weight-bold resultats-text">{t("oser-parler")}</span><br /><br />
<span className="resultats-text">{t("les-changements")}</span>
<span className="font-weight-bold">{t("oser-parler")}</span><br /><br />
{t("les-changements")}
</p>
</Col>

Expand Down Expand Up @@ -295,10 +295,6 @@ export const getStaticProps = async ({ locale }) => ({

const ComprendreTestStyle = () => (
<style jsx="true">{`
.resultats-text {
font-size: 13px;
}
.resultats-form-input {
max-width: 400px;
}
Expand Down
5 changes: 4 additions & 1 deletion public/locales/fr-FR/footer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"la-fabrique": "La Fabrique Numérique des Ministères Sociaux",
"cgu": "Conditions générales",
"mentions-legales": "Mentions légales",
"politique-confidentialite": "Politique de confidentialité"
"politique-confidentialite": "Politique de confidentialité",
"republique": "république",
"francaise": "française",
"licence": "Sauf mention contraire, tous les textes de ce site sont sous"
}
109 changes: 40 additions & 69 deletions src/components/Footer.js
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,56 @@
import React from "react";
import Link from "next/link";

import { useTranslation } from 'next-i18next';
import { Row, Col } from "react-bootstrap";

const LightLink = ({ href, children }) => (
<Link href={href} passHref>
<a style={{
color: "black",
fontSize: "12px",
lineHeight: "22px"
}} href={href}>{children}</a>
</Link >
);

const Separator = () => (
<span style={{ color: "black", marginRight: 5 }}>-</span>
);

export function Footer() {
const { t } = useTranslation('footer');

return (
<footer className="content-footer">

<Row className="content-row">
<img
src="/img/logo-republique-francaise.png"
height={60}
alt="Ministère des solidarités et de la santé"
/>

<Col>
<div className="title">{t('la-fabrique')}</div>
<div className="container text-center box3">
<ul className="list-inline">
<li className="list-inline-item">
<LightLink href="/annexes/cgu">{t('cgu')}</LightLink>
<footer className="fr-footer" role="contentinfo" id="footer" style={{ marginTop: 30 }}>
<div className="fr-container">
<div className="fr-footer__body">
<div className="fr-footer__brand fr-enlarge-link">
<a href="/" title="Retour à l’accueil">
<p className="fr-logo" title="république française">{t('republique')}<br />{t('francaise')}</p>
</a>
</div>
<div className="fr-footer__content">
<p className="fr-footer__content-desc">{t('la-fabrique')}</p>
<ul className="fr-footer__content-list">
<li className="fr-footer__content-item">
<a className="fr-footer__content-link" href="https://legifrance.gouv.fr">legifrance.gouv.fr</a>
</li>
<li className="fr-footer__content-item">
<a className="fr-footer__content-link" href="https://gouvernement.fr">gouvernement.fr</a>
</li>
<Separator />
<li className="list-inline-item">
<LightLink href="/annexes/mentions-legales">{t('mentions-legales')}</LightLink>
<li className="fr-footer__content-item">
<a className="fr-footer__content-link" href="https://service-public.fr">service-public.fr</a>
</li>
<Separator />
<li className="list-inline-item">
<LightLink href="/annexes/politique-confidentialite">
{t('politique-confidentialite')}
</LightLink>
<li className="fr-footer__content-item">
<a className="fr-footer__content-link" href="https://data.gouv.fr">data.gouv.fr</a>
</li>
</ul>
</div>
</Col>
</Row>

<FooterStyle />
</div>
<div className="fr-footer__bottom">
<ul className="fr-footer__bottom-list">
<li className="fr-footer__bottom-item">
<a className="fr-footer__bottom-link" href="/annexes/cgu">{t('cgu')}</a>
</li>
<li className="fr-footer__bottom-item">
<a className="fr-footer__bottom-link" href="/annexes/mentions-legales">{t('mentions-legales')}</a>
</li>
<li className="fr-footer__bottom-item">
<a className="fr-footer__bottom-link" href="/annexes/politique-confidentialite">{t('politique-confidentialite')}</a>
</li>
</ul>
<div className="fr-footer__bottom-copy">
<p>{t('licence')} <a href="https://github.com/etalab/licence-ouverte/blob/master/LO.md" target="_blank">licence etalab-2.0</a>
</p>
</div>
</div>
</div>
</footer >

);
}

const FooterStyle = () => (
<style jsx="true">{`
.content-footer {
background-color: var(--bleu-clair);
border-radius: 25px 25px 0 0;
padding-top: 10px;
padding-bottom: 10px;
margin-top: 20px;
}
.content-row {
align-items: center;
margin-left: 20px;
}
.title {
font-size: 20px;
text-align: center;
font-weight: bold;
line-height: 33px;
color: var(--bleu-texte);
margin-right: 10px;
}
`}</style>
);
1 change: 0 additions & 1 deletion src/components/Nav.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ const NavStyle = () => (
.nav-link {
margin: 0 10px;
color: var(--bleu-texte) !important;
font-size: 13px;
}
`}</style>
);
116 changes: 61 additions & 55 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,7 @@
core-js-pure "^3.16.0"
regenerator-runtime "^0.13.4"

"@babel/[email protected]":
version "7.12.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.13.17", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7":
"@babel/[email protected]", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.13.17", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7":
version "7.15.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
Expand Down Expand Up @@ -646,20 +639,20 @@
resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c"
integrity sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA==

"@next/[email protected].0":
version "11.1.0"
resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.0.tgz#cae83d8e0a65aa9f2af3368f8269ffd9d911746a"
integrity sha512-zPJkMFRenSf7BLlVee8987G0qQXAhxy7k+Lb/5hLAGkPVHAHm+oFFeL+2ipbI2KTEFlazdmGY0M+AlLQn7pWaw==
"@next/[email protected].2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.2.tgz#27996efbbc54c5f949f5e8c0a156e3aa48369b99"
integrity sha512-+fteyVdQ7C/OoulfcF6vd1Yk0FEli4453gr8kSFbU8sKseNSizYq6df5MKz/AjwLptsxrUeIkgBdAzbziyJ3mA==

"@next/[email protected].0":
version "11.1.0"
resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.1.0.tgz#ee6b9117a1f9bb137479dfa51d5a9e38e066a62f"
integrity sha512-64EgW8SzJRQls2yJ5DkuljRxgE24o2kYtX/ghTkPUJYsfidHMWzQGwg26IgRbb/uHqTd1G0W5UkKag+Nt8TWaQ==
"@next/[email protected].2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.1.2.tgz#1fe92c364fdc81add775a16c678f5057c6aace98"
integrity sha512-xZmixqADM3xxtqBV0TpAwSFzWJP0MOQzRfzItHXf1LdQHWb0yofHHC+7eOrPFic8+ZGz5y7BdPkkgR1S25OymA==

"@next/[email protected].0":
version "11.1.0"
resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.1.0.tgz#8d4e8020a4cbdacbca431a0bf40c4d28187083af"
integrity sha512-h+ry0sTk1W3mJw+TwEf91aqLbBJ5oqAsxfx+QryqEItNtfW6zLSSjxkyTYTqX8DkgSssQQutQfATkzBVgOR+qQ==
"@next/[email protected].2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.1.2.tgz#73795dc5454b7af168bac93df7099965ebb603be"
integrity sha512-rDF/mGY2NC69mMg2vDqzVpCOlWqnwPUXB2zkARhvknUHyS6QJphPYv9ozoPJuoT/QBs49JJd9KWaAzVBvq920A==
dependencies:
"@babel/code-frame" "7.12.11"
anser "1.4.9"
Expand All @@ -673,10 +666,30 @@
stacktrace-parser "0.1.10"
strip-ansi "6.0.0"

"@next/[email protected]":
version "11.1.0"
resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.1.0.tgz#60c3c7b127a5dab8b0a2889a7dcf8a90d2c4e592"
integrity sha512-g5DtFTpLTGa36iy9DuZawtJeitI11gysFGKPQQqy+mNbSFazguArcJ10gAYFlbqpIi4boUamWNI5mAoSPx3kog==
"@next/[email protected]":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.1.2.tgz#44ea40d8e773e4b77bad85e24f6ac041d5e4b4a5"
integrity sha512-hsoJmPfhVqjZ8w4IFzoo8SyECVnN+8WMnImTbTKrRUHOVJcYMmKLL7xf7T0ft00tWwAl/3f3Q3poWIN2Ueql/Q==

"@next/[email protected]":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-11.1.2.tgz#93226c38db488c4b62b30a53b530e87c969b8251"
integrity sha512-hZuwOlGOwBZADA8EyDYyjx3+4JGIGjSHDHWrmpI7g5rFmQNltjlbaefAbiU5Kk7j3BUSDwt30quJRFv3nyJQ0w==

"@next/[email protected]":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-11.1.2.tgz#792003989f560c00677b5daeff360b35b510db83"
integrity sha512-PGOp0E1GisU+EJJlsmJVGE+aPYD0Uh7zqgsrpD3F/Y3766Ptfbe1lEPPWnRDl+OzSSrSrX1lkyM/Jlmh5OwNvA==

"@next/[email protected]":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-11.1.2.tgz#8216b2ae1f21f0112958735c39dd861088108f37"
integrity sha512-YcDHTJjn/8RqvyJVB6pvEKXihDcdrOwga3GfMv/QtVeLphTouY4BIcEUfrG5+26Nf37MP1ywN3RRl1TxpurAsQ==

"@next/[email protected]":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-11.1.2.tgz#e15824405df137129918205e43cb5e9339589745"
integrity sha512-e/pIKVdB+tGQYa1cW3sAeHm8gzEri/HYLZHT4WZojrUxgWXqx8pk7S7Xs47uBcFTqBDRvK3EcQpPLf3XdVsDdg==

"@node-rs/[email protected]":
version "1.2.1"
Expand Down Expand Up @@ -3967,17 +3980,17 @@ next-i18next@^8.5.5:
i18next-fs-backend "^1.0.7"
react-i18next "^11.8.13"

next@^11.0.0:
version "11.1.0"
resolved "https://registry.yarnpkg.com/next/-/next-11.1.0.tgz#767d4c4fa0b9b0c768cdbd6c9f03dd86b5d701c0"
integrity sha512-GHBk/c7Wyr6YbFRFZF37I0X7HKzkHHI8pur/loyXo5AIE8wdkbGPGO0ds3vNAO6f8AxZAKGCRYtAzoGlVLoifA==
next@^11.1.1:
version "11.1.2"
resolved "https://registry.yarnpkg.com/next/-/next-11.1.2.tgz#527475787a9a362f1bc916962b0c0655cc05bc91"
integrity sha512-azEYL0L+wFjv8lstLru3bgvrzPvK0P7/bz6B/4EJ9sYkXeW8r5Bjh78D/Ol7VOg0EIPz0CXoe72hzAlSAXo9hw==
dependencies:
"@babel/runtime" "7.12.5"
"@babel/runtime" "7.15.3"
"@hapi/accept" "5.0.2"
"@next/env" "11.1.0"
"@next/polyfill-module" "11.1.0"
"@next/react-dev-overlay" "11.1.0"
"@next/react-refresh-utils" "11.1.0"
"@next/env" "11.1.2"
"@next/polyfill-module" "11.1.2"
"@next/react-dev-overlay" "11.1.2"
"@next/react-refresh-utils" "11.1.2"
"@node-rs/helper" "1.2.1"
assert "2.0.0"
ast-types "0.13.2"
Expand Down Expand Up @@ -4015,13 +4028,18 @@ next@^11.0.0:
stream-browserify "3.0.0"
stream-http "3.1.1"
string_decoder "1.3.0"
styled-jsx "4.0.0"
styled-jsx "4.0.1"
timers-browserify "2.0.12"
tty-browserify "0.0.1"
use-subscription "1.5.1"
util "0.12.3"
util "0.12.4"
vm-browserify "1.1.2"
watchpack "2.1.1"
optionalDependencies:
"@next/swc-darwin-arm64" "11.1.2"
"@next/swc-darwin-x64" "11.1.2"
"@next/swc-linux-x64-gnu" "11.1.2"
"@next/swc-win32-x64-msvc" "11.1.2"

[email protected]:
version "2.6.1"
Expand Down Expand Up @@ -5213,10 +5231,10 @@ styled-components@^5.2.3:
shallowequal "^1.1.0"
supports-color "^5.5.0"

[email protected].0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-4.0.0.tgz#f7b90e7889d0a4f4635f8d1ae9ac32f3acaedc57"
integrity sha512-2USeoWMoJ/Lx5s2y1PxuvLy/cz2Yrr8cTySV3ILHU1Vmaw1bnV7suKdblLPjnyhMD+qzN7B1SWyh4UZTARn/WA==
[email protected].1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-4.0.1.tgz#ae3f716eacc0792f7050389de88add6d5245b9e9"
integrity sha512-Gcb49/dRB1k8B4hdK8vhW27Rlb2zujCk1fISrizCcToIs+55B4vmUM0N9Gi4nnVfFZWe55jRdWpAqH1ldAKWvQ==
dependencies:
"@babel/plugin-syntax-jsx" "7.14.5"
"@babel/types" "7.15.0"
Expand Down Expand Up @@ -5553,10 +5571,10 @@ [email protected]:
dependencies:
inherits "2.0.1"

[email protected].3:
version "0.12.3"
resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888"
integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==
[email protected].4, util@^0.12.0:
version "0.12.4"
resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
dependencies:
inherits "^2.0.3"
is-arguments "^1.0.4"
Expand All @@ -5572,18 +5590,6 @@ util@^0.11.0:
dependencies:
inherits "2.0.3"

util@^0.12.0:
version "0.12.4"
resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
dependencies:
inherits "^2.0.3"
is-arguments "^1.0.4"
is-generator-function "^1.0.7"
is-typed-array "^1.1.3"
safe-buffer "^5.1.2"
which-typed-array "^1.1.2"

uuid@^8.3.2:
version "8.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
Expand Down

0 comments on commit 8affa2c

Please sign in to comment.