diff --git a/package-lock.json b/package-lock.json index 5b479bd..997c177 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,6 @@ "react-redux": "^9.1.2", "react-router-dom": "^6.25.1", "redux": "^5.0.1", - "remixicon": "^4.3.0", "vite": "^5.3.4", "web-vitals": "^4.2.2" }, @@ -4737,11 +4736,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/remixicon": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/remixicon/-/remixicon-4.3.0.tgz", - "integrity": "sha512-jRYQ37dTFSkJtvcxwTUAkIiXkYRvA9EDvVuXPNrmt2xf/VS//CRgFtsX2TAFBoQOhh9SDh7l6La4Xu12snEyxg==" - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", diff --git a/package.json b/package.json index b512f71..272b5b9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "react-redux": "^9.1.2", "react-router-dom": "^6.25.1", "redux": "^5.0.1", - "remixicon": "^4.3.0", "vite": "^5.3.4", "web-vitals": "^4.2.2" }, diff --git a/public/logos/ex-libris-france-services.svg b/public/logos/ex-libris-france-services.svg deleted file mode 100644 index 83cd852..0000000 --- a/public/logos/ex-libris-france-services.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/logos/logo-banque-des-territoires.svg b/public/logos/logo-banque-des-territoires.svg deleted file mode 100644 index 3a1d2cd..0000000 --- a/public/logos/logo-banque-des-territoires.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/logos/pix-citoyen.png b/public/logos/pix-citoyen.png deleted file mode 100644 index 5b6b45d..0000000 Binary files a/public/logos/pix-citoyen.png and /dev/null differ diff --git a/public/logos/pix-ressources.png b/public/logos/pix-ressources.png deleted file mode 100644 index 08485b8..0000000 Binary files a/public/logos/pix-ressources.png and /dev/null differ diff --git a/public/logos/pix-utilisation.png b/public/logos/pix-utilisation.png deleted file mode 100644 index c8ebed7..0000000 Binary files a/public/logos/pix-utilisation.png and /dev/null differ diff --git a/src/App.js b/src/App.js index 7466591..b99b639 100644 --- a/src/App.js +++ b/src/App.js @@ -1,11 +1,8 @@ import React from 'react'; import { Routes, Route, Navigate } from 'react-router-dom'; -import './assets/js/app.js'; -import './assets/css/app.scss'; -import Login from './components/anonymous/Login.js'; -import Home from './components/connected/Home.js'; +import Login from './components/anonymous/Login'; +import Home from './components/connected/Home'; import ChoosePassword from './components/anonymous/createAccount/ChoosePassword'; - import PrivateRoute from './components/connected/PrivateRoute'; import Footer from './components/common/Footer'; import EmailConfirmer from './components/anonymous/ConfirmationEmail'; @@ -13,9 +10,13 @@ import ForgottenPassword from './components/anonymous/ForgottenPassword'; import CandidatureSupprimee from './components/anonymous/CandidatureSupprimee'; import { useSelector } from 'react-redux'; -function App() { +import '@gouvfr/dsfr/dist/dsfr/dsfr.module.min.js'; +import '@gouvfr/dsfr/dist/dsfr/dsfr.min.css'; +import './assets/css/app.scss'; +function App() { const isLoading = useSelector(state => state.alerteEtSpinner?.isLoading); + return (
{isLoading && diff --git a/src/actions/conseiller.actions.js b/src/actions/conseiller.actions.js index 34a17d2..9267088 100644 --- a/src/actions/conseiller.actions.js +++ b/src/actions/conseiller.actions.js @@ -1,6 +1,6 @@ import download from 'downloadjs'; -import { conseillerService } from '../services/conseiller.service.js'; -import { userService } from '../services/user.service.js'; +import { conseillerService } from '../services/conseiller.service'; +import { userService } from '../services/user.service'; export const conseillerActions = { get, diff --git a/src/actions/user.actions.js b/src/actions/user.actions.js index a0552af..18be144 100644 --- a/src/actions/user.actions.js +++ b/src/actions/user.actions.js @@ -1,4 +1,4 @@ -import { userService } from '../services/user.service.js'; +import { userService } from '../services/user.service'; export const userActions = { login, diff --git a/src/assets/css/app.scss b/src/assets/css/app.scss index 3afb987..f5e5454 100644 --- a/src/assets/css/app.scss +++ b/src/assets/css/app.scss @@ -1,12 +1,398 @@ -@use './style'; - -@import '../../../node_modules/@gouvfr/dsfr/dist/dsfr/dsfr.min.css'; -@import '../../../node_modules/@gouvfr/dsfr/dist/utility/icons/icons-communication/icons-communication.min.css'; -@import '../../../node_modules/@gouvfr/dsfr/dist/utility/icons/icons-business/icons-business.min.css'; -@import '../../../node_modules/@gouvfr/dsfr/dist/utility/icons/icons-user/icons-user.min.css'; -@import '../../../node_modules/@gouvfr/dsfr/dist/utility/icons/icons-design/icons-design.min.css'; -@import '../../../node_modules/@gouvfr/dsfr/dist/utility/icons/icons-system/icons-system.min.css'; -@import '../../../node_modules/@gouvfr/dsfr/dist/utility/icons/icons-document/icons-document.min.css'; -@import '../../../node_modules/react-datepicker/dist/react-datepicker.css'; -@import '../../../node_modules/remixicon/fonts/remixicon.css'; +.flashBag { + background-color: var(--grey-50-1000); + color: #008941; + padding: 30px; + text-align: center; + font-weight: bold; + border: 1px solid; + border-radius: 20px; +} +.labelError { + color: #FF3333; +} + +.red-background { + background-color: #E10600; +} + +.header__logo-rf { + height: 78px; +} + +.Login { + border-radius: 8px; + text-align: center; +} + +.fr-sur-mesure { + flex: none; + padding-right: 0; + height: 75px; +} + +.logo-conseiller-numerique { + height: 75px; + margin-left: 1.25rem; + display: flex; +} + +.logo-conseiller-numerique img:first-child { + height: 54px; + margin-top: 1.1em; + font-weight: lighter !important; +} + +.fr-tag.current { + font-weight: 600; + color: var(--grey-50-1000); + background-color: #5770BE; +} + +.fr-tag:hover { + background-color: #D5DBEF; +} + +.hidden { + display: none; +} + +.big-btn { + display: inline-block; + padding: 1.5rem; + border: none; + border-radius: 50px; + font-size: 1rem !important; + width: 60%; + text-align: center; + background: var(--grey-50-1000) !important; + border: 1px solid #383838 !important; + color: #383838 !important; +} + +/* Modal Gestion */ +.modalOpened { + opacity: 1; + visibility: visible; +} + +#fr-modal-supprimer-candidat { + .fr-modal__body { + width: 130%; + } +} + +/** Icones menu gauche **/ +.Menu .fr-sidemenu__item--active [class^="fr-fi"] { + color: var(--blue-france-975-sun-113); +} + +.fr-sidemenu__inner { + padding: 0 1rem 0 .25rem; +} + +/** style custom **/ +.alignRight { + text-align: right; +} + +.valignTextTop { + vertical-align: text-top; +} + +.valignMiddle { + vertical-align: middle; +} + +.valignBottom { + vertical-align: bottom; +} + +.conseiller .customTitleLink { + color: var(--blue-france-975-sun-113); + text-align: right; +} + +.capitalizeFirstLetter { + text-transform: capitalize; + color: var(--blue-france-975-sun-113); +} + +.centrerTexte { + text-align: center; +} + +.titrage { + font-size: 56px; +} + +.invalid, .important { + color: #e10600; +} + +.valid { + color: #008941; +} + +.sansBoxShadow { + box-shadow: none; +} + +.react-datepicker-wrapper { + width: 100%; +} + +.supprimer-link { + text-decoration: underline; + cursor: pointer; +} + +.supprimer-link:hover { + color: red; +} + +.upload-btn { + height: 64px; + cursor: pointer; +} + +.download-btn { + padding: 1em 1.8em; + width: 100%; + text-align: left; +} + +.download-img { + margin-right: 0.8em; +} + +.red-btn { + background-color: #e10600; + padding: .5rem 1.5rem; + text-align: center; + color: #e7e7e7; + font-size: 1rem; + cursor: pointer; + &:hover { + background-color: #d30000 !important; + } +} + +.desactiver-btn { + padding: .5rem 1.5rem; + text-align: center; + font-size: 1rem; +} + +.info-candidat { + margin-bottom: 'revert'; +} + +/** Header **/ +.logo { + height: 72px; + margin-top: -32px; +} + +.fr-header__tools-links { + display: block !important; +} + +.menu-flex { + display: flex; + justify-content: space-between; + align-items: baseline; +} + +.user-header { + margin: 0 2.5rem 0 0.7rem; +} + +.user-img { + position: relative; + top: 3px; +} + +.informations p { + margin: 0 0 1.5rem; +} + +.image-download { + margin: 0 15px 0 6px; +} + +.dropZone { + background-color: #f3f3f3; + padding: 15px 15px 1px; + cursor: pointer; + overflow: hidden; + text-overflow: ellipsis; + + .drop-error-message { + text-align: center; + color: #ff6961; + } + + .image-dropZone { + float: left; + margin: 0 15px; + } + + .texte-dropZone { + margin: 0 10px 1.5rem 54px; + } + + img { + margin-right: 15px; + } +} + +.drop-error { + background-color: #ffb4bf; + border: 1px solid #ff6961; +} + +.contenu-droite { + float: right; +} + +.marge-radio { + margin-right: 7.5rem; +} + +.input-autre { + width: 322px; +} + +.wrapperModal { + position: fixed; + z-index: 1; + padding-top: 100px; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: rgb(0,0,0); + background-color: rgba(0,0,0,0.4); +} + +.spinnerCustom { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + z-index: 2; +} + +.link-test-pix { + display: 'flex'; + align-items: center; + width: 41%; +} + +@media (min-width: 769px) { + .headerAlignementmd-lg { + margin-left: 2.5rem !important; + } +} + +@media (max-width: 1092) and (min-width: 992px) { + .info-btn { + width: 100%; + text-align: center; + padding: 0 35%; + } +} + +@media (max-width: 1177px) and (min-width: 992px) { + .upload-btn { + height: 80px; + } +} + +@media (max-width: 992px) { + .hide-deconnexion { + display: none; + } + + .user-header { + margin: 0 2.5rem 0 0.7rem; + } + + #fr-modal-supprimer-candidat { + .fr-modal__body { + width: 100%; + } + } +} + +@media (max-width: 963px) { + .user-header { + margin: 0 1rem 0 0.7rem; + } + + .marge-radio { + margin-right: 1rem; + } +} + +@media (max-width: 767px) { + .responsiveHeaderTools { + display: block !important; + } + + .responsiveVisibilityMenu { + visibility: hidden; + margin: -3.5rem; + } + + .responsiveBouton { + width: 26rem; + } + + .responsiveTextHeader { + text-align: end; + margin-right: 0; + } + + .headerAlignement { + margin-left: 0.6rem; + } + + .responsiveHeaderTools { + margin-left: 0 !important; + } + + .marge-contenu { + margin: 0.7em; + } +} + +@media (min-width: 460px) and (max-width: 767px) { + .placement-droite { + position: absolute; + right: 0; + margin: 0 30px; + } +} + +@media (max-width: 460px) { + .user-header { + font-size: 12px; + } + + .marge-contenu { + margin: 0 10px; + } + + .input-autre { + width: 80%; + } +} + +@media (max-width: 411px) { + .upload-btn { + height: 80px; + } +} diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss deleted file mode 100644 index 0b4f3ef..0000000 --- a/src/assets/css/style.scss +++ /dev/null @@ -1,357 +0,0 @@ -$blue-france:#000091; - -.flashBag { - background-color: white; - color: #008941; - padding: 30px; - text-align: center; - font-weight: bold; - border: 1px solid; - border-radius: 20px; -} - -.labelError { - color: #FF3333; -} -.red-background { - background-color: #E10600; -} - -.header__logo-rf { - height: 78px; -} - -.Login { - border-radius: 8px; - text-align: center; -} - -.fr-sur-mesure { - flex: none; - padding-right: 0; - height: 75px; -} - -.logo-conseiller-numerique { - height: 75px; - margin-left: 1.25rem; - display: flex; -} - -.logo-conseiller-numerique img:first-child { - height: 54px; - margin-top: 1.1em; - font-weight: lighter!important; -} - -.fr-tag.current { - font-weight: 600; - color: white; - background-color: #5770BE; -} - -.fr-tag:hover { - background-color: #D5DBEF; -} - -.hidden { - display: none; -} - -.big-btn { - display: inline-block; - padding: 1.5rem; - border: none; - border-radius: 50px; - font-size: 1rem!important; - width: 60%; - text-align: center; - background: white!important; - border: 1px solid #383838!important; - color: #383838!important; -} - -/* Modal Gestion */ -.modalOpened { - opacity: 1; - visibility: visible; -} -#fr-modal-supprimer-candidat { - .fr-modal__body { - width: 130%; - } -} - -/** Icones menu gauche **/ -.Menu .fr-sidemenu__item--active [class^="fr-fi"] { - color: $blue-france; -} -.fr-sidemenu__inner { - padding: 0 1rem 0 .25rem; -} - -/** style custom **/ -.alignRight { - text-align: right; -} - -.valignTextTop { - vertical-align: text-top; -} - -.valignMiddle { - vertical-align: middle; -} - -.valignBottom { - vertical-align: bottom; -} - -.conseiller .customTitleLink { - color: $blue-france; - text-align: right; -} - -.capitalizeFirstLetter { - text-transform: capitalize; - color: $blue-france; -} - -.centrerTexte { - text-align: center; -} - -.titrage { - font-size: 56px; -} - -.invalid, .important { - color: #e10600; -} - -.valid { - color: #008941; -} -.sansBoxShadow { - box-shadow: none; -} -.react-datepicker-wrapper { - width: 100%; -} -.supprimer-link { - text-decoration: underline; - cursor: pointer; -} -.supprimer-link:hover { - color: red; -} -.upload-btn { - height: 64px; - cursor: pointer; -} -.download-btn { - padding: 1em 1.8em; - width: 100%; - text-align: left; -} -.download-img { - margin-right: 0.8em; -} -.red-btn { - background-color: #e10600; - padding: .5rem 1.5rem; - text-align: center; - color: #e7e7e7; - font-size: 1rem; - cursor: pointer; - &:hover { - background-color: #d30000 !important; - } -} -.desactiver-btn { - padding: .5rem 1.5rem; - text-align: center; - font-size: 1rem; -} -.info-candidat { - margin-bottom: 'revert'; -} - -/** Header **/ -.logo { - height: 72px; - margin-top: -32px; -} -.fr-header__tools-links { - display: block!important; -} -.menu-flex { - display: flex; - justify-content: space-between; - align-items: baseline; -} -.user-header { - margin: 0 2.5rem 0 0.7rem; -} -.user-img { - position: relative; - top: 3px; -} -.informations p { - margin: 0 0 1.5rem; -} -.image-download { - margin: 0 15px 0 6px; -} - -.dropZone { - background-color: #f3f3f3; - padding: 15px 15px 1px; - cursor: pointer; - overflow: hidden; - text-overflow: ellipsis; - - .drop-error-message { - text-align: center; - color: #ff6961; - } - .image-dropZone { - float: left; - margin: 0 15px; - } - .texte-dropZone { - margin: 0 10px 1.5rem 54px; - } - img { - margin-right: 15px; - } -} -.drop-error { - background-color: #ffb4bf; - border: 1px solid #ff6961; -} -.contenu-droite { - float: right; -} -.marge-radio { - margin-right: 7.5rem; -} -.input-autre { - width: 322px; -} - -.wrapperModal { - position: fixed; - z-index: 1; - padding-top: 100px; - left: 0; - top: 0; - width: 100%; - height: 100%; - overflow: auto; - background-color: rgb(0,0,0); - background-color: rgba(0,0,0,0.4); -} -.spinnerCustom { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - z-index: 2; -} - -.link-test-pix { - display: 'flex'; - align-items: center; - width: 41%; -} - - -@media (min-width: 769px) { - .headerAlignementmd-lg { - margin-left: 2.5rem!important; - } -} - -@media (max-width: 1092) and (min-width: 992px) { - .info-btn { - width: 100%; - text-align: center; - padding: 0 35%; - } -} -@media (max-width: 1177px) and (min-width: 992px) { - .upload-btn { - height: 80px; - } -} -@media (max-width: 992px) { - .hide-deconnexion { - display: none; - } - .user-header { - margin: 0 2.5rem 0 0.7rem; - } - #fr-modal-supprimer-candidat { - .fr-modal__body { - width: 100%; - } - } -} -@media (max-width: 963px) { - .user-header { - margin: 0 1rem 0 0.7rem; - } - .marge-radio { - margin-right: 1rem; - } -} -@media (max-width: 767px) { - .responsiveHeaderTools { - display: block!important; - } - .responsiveVisibilityMenu { - visibility: hidden; - margin: -3.5rem; - } - .responsiveBouton { - width: 26rem; - } - .responsiveTextHeader { - text-align: end; - margin-right: 0px; - } - .headerAlignement { - margin-left: 0.6rem; - } - .responsiveHeaderTools { - margin-left: 0px !important; - } - .marge-contenu { - margin: 0.7em; - } -} -@media (min-width: 460px) and (max-width: 767px) { - .placement-droite { - position: absolute; - right: 0; - margin: 0 30px; - } -} -@media (max-width: 460px) { - - .user-header { - font-size: 12px; - } - .marge-contenu { - margin: 0 10px; - } - .input-autre { - width: 80%; - } -} -@media (max-width: 411px) { - .upload-btn { - height: 80px; - } -} diff --git a/src/assets/js/app.js b/src/assets/js/app.js deleted file mode 100644 index 20155e7..0000000 --- a/src/assets/js/app.js +++ /dev/null @@ -1 +0,0 @@ -import '@gouvfr/dsfr/dist/dsfr/dsfr.module'; diff --git a/src/components/common/Header.js b/src/components/common/Header.js index 7e12066..fdb2708 100644 --- a/src/components/common/Header.js +++ b/src/components/common/Header.js @@ -3,6 +3,8 @@ import PropTypes from 'prop-types'; import { Link } from 'react-router-dom'; import { useSelector } from 'react-redux'; +import '@gouvfr/dsfr/dist/utility/icons/icons-user/icons-user.min.css'; + function Header({ connected }) { const user = useSelector(state => state.authentication?.user?.user); @@ -35,7 +37,7 @@ function Header({ connected }) {
  • Se déconnecter  - +
    • diff --git a/src/components/connected/Informations.js b/src/components/connected/Informations.js index 86a0ff6..d17a177 100644 --- a/src/components/connected/Informations.js +++ b/src/components/connected/Informations.js @@ -5,6 +5,10 @@ import PropTypes from 'prop-types'; import dayjs from 'dayjs'; import DatePicker from 'react-datepicker'; +import '@gouvfr/dsfr/dist/utility/icons/icons-design/icons-design.min.css'; +import '@gouvfr/dsfr/dist/utility/icons/icons-system/icons-system.min.css'; +import 'react-datepicker/dist/react-datepicker.css'; + function Informations({ infos, setInfos, conseiller }) { const dispatch = useDispatch(); const { _id } = useSelector(state => state.authentication.user?.user); diff --git a/src/components/connected/MonEspace.js b/src/components/connected/MonEspace.js index edb3642..279dc19 100644 --- a/src/components/connected/MonEspace.js +++ b/src/components/connected/MonEspace.js @@ -245,7 +245,7 @@ function MonEspace() {

    Pour consulter vos résultats, il vous suffit de vous connecter à votre compte personnel Pix, vous pourrez alors retrouver vos résultats depuis la page "Mes certifications". - Elle est accessible depuis la rubrique "Certification" + Elle est accessible depuis la rubrique "Certification"{' '} en cliquant sur "Voir mes certifications".