Skip to content
This repository has been archived by the owner on Nov 15, 2024. It is now read-only.

Modal migration #695

Merged
merged 3 commits into from
Nov 4, 2024
Merged

Modal migration #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3556f8a
modal migration
Ornella452 Oct 31, 2024
3bed5b3
fix lint
Ornella452 Oct 31, 2024
803d63b
fix resonsive + lien coop
Ornella452 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/logos/coopMediationNumerique.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logos/iconeCoop.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logos/pin-conum.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 15 additions & 14 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
import React, { useEffect } from 'react';
import { Routes, Route, Navigate } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux';
import Login from './components/anonymous/Login.js';
// import Login from './components/anonymous/Login.js';
import MigrationCoop from './components/anonymous/MigrationCoop';
import Home from './components/connected/Home';
import Hub from './components/hub';
import Coordinateur from './components/coordinateur';
import ChoosePassword from './components/anonymous/ChoosePassword';
import ChoosePasswordHub from './components/anonymous/ChoosePasswordHub';
import ValidationAccount from './components/connected/ValidationAccount';
import ForgottenPassword from './components/anonymous/ForgottenPassword';
import EnregistrerStatistiquesPdf from './components/anonymous/EnregistrerStatistiquesPdf';
import StatistiquesNationales from './components/anonymous/StatistiquesNationales';
// import ChoosePassword from './components/anonymous/ChoosePassword';
// import ChoosePasswordHub from './components/anonymous/ChoosePasswordHub';
// import ValidationAccount from './components/connected/ValidationAccount';
// import ForgottenPassword from './components/anonymous/ForgottenPassword';
// import EnregistrerStatistiquesPdf from './components/anonymous/EnregistrerStatistiquesPdf';
// import StatistiquesNationales from './components/anonymous/StatistiquesNationales';
import PrivateRoute from './components/connected/PrivateRoute';
import ChoosePasswordChangeMailbox from './components/anonymous/choosePasswordChangeMailbox';
import Propos from './components/anonymous/Propos';
import EmailConfirmer from './components/anonymous/ConfirmationEmail';
// import ChoosePasswordChangeMailbox from './components/anonymous/choosePasswordChangeMailbox';
// import Propos from './components/anonymous/Propos';
// import EmailConfirmer from './components/anonymous/ConfirmationEmail';
import { permanenceActions } from './actions';

import './assets/js/app.js';
import './assets/css/app.scss';
import '@gouvfr/dsfr/dist/utility/icons/icons-system/icons-system.min.css';
import 'react-datepicker/dist/react-datepicker.min.css';
// import 'react-datepicker/dist/react-datepicker.min.css';
import 'remixicon/fonts/remixicon.css';
import 'leaflet/dist/leaflet.css';

Expand Down Expand Up @@ -56,8 +57,8 @@ function App() {
<div className="wrapperModal"></div>
}
<Routes>
<Route path="/login" element={<Login />} />
<Route path="/mot-de-passe-oublie" element={<ForgottenPassword />} />
<Route path="/login" element={<MigrationCoop />} />
{/* <Route path="/mot-de-passe-oublie" element={<ForgottenPassword />} />
<Route path="/renouveler-mot-de-passe/:token" element={<ForgottenPassword />} />
<Route path="/inscription/:token" element={<ChoosePassword />} />
<Route path="/inscription-hub/:token" element={<ChoosePasswordHub />} />
Expand All @@ -68,7 +69,7 @@ function App() {
<Route path="/statistiques-nationales" element={<StatistiquesNationales />} />
<Route path="/statistiques/:type/:id/:dateDebut/:dateFin/:codePostal/:ville" element={<EnregistrerStatistiquesPdf />} />
<Route path="/statistiques/:type/:id/:dateDebut/:dateFin/:codePostal" element={<EnregistrerStatistiquesPdf />} />
<Route path="/statistiques/:type/:dateDebut/:dateFin" element={<EnregistrerStatistiquesPdf />} />
<Route path="/statistiques/:type/:dateDebut/:dateFin" element={<EnregistrerStatistiquesPdf />} /> */}
<Route path="/" element={<PrivateRoute />}>
<Route index element={<Navigate to="/accueil" />} />
{user?.role === 'conseiller' &&
Expand Down
31 changes: 16 additions & 15 deletions src/assets/css/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
@use "./style";
@use "./statistics";
@use "./cra";
@use "./validationAccount";
@use "./choosePassword";
@use "./welcome";
@use "./login";
@use "./admin";
@use "./conseillerDetails";
@use "./formulaire";
@use "./mesInformations";
@use "./historique";
@use "./a-propos";
@use "./statisitiquesPDF";
@use "./monEspaceCandidat";
// @use "./style";
// @use "./statistics";
// @use "./cra";
// @use "./validationAccount";
// @use "./choosePassword";
// @use "./welcome";
// @use "./login";
// @use "./admin";
// @use "./conseillerDetails";
// @use "./formulaire";
// @use "./mesInformations";
// @use "./historique";
// @use "./a-propos";
// @use "./statisitiquesPDF";
// @use "./monEspaceCandidat";
@use "./migrationCoop.scss";

@import "../../../node_modules/@gouvfr/dsfr/dist/dsfr/dsfr.min.css";
108 changes: 108 additions & 0 deletions src/assets/css/migrationCoop.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
.page-migration {
max-width: auto;
min-height: 688px;
padding: 96px 102px 96px 102px;
margin-bottom: 126px;
border-radius: 32px;
}

.div-annonce-migration {
max-width: 588px;
min-height: 496px;
margin-bottom: 40px;

h1 {
width: 588px;
height: 96px;
font-family: Marianne;
font-size: 40px;
font-weight: 700;
line-height: 48px;
text-align: left;
margin-bottom: 40px;
}

div {
max-width: 588px;
min-height: 408px;
margin-bottom: 24px;

div {
width: 538px;
min-height: 104px;
padding: 16px 24px 16px 24px;
margin-bottom: 16px;
border-radius: 8px;

img {
width: 64px;
height: 64px;
border-radius: 8px;
}

p:nth-of-type(1) {
max-width: 410px;
min-height: 72px;
margin-bottom: 4px;

}
}

p:nth-of-type(2) {
font-family: Marianne;
font-size: 20px;
font-weight: 400;
line-height: 32px;
text-align: left;
width: 588px;
height: 160px;



}
}

}

.div-coop-mediation-numerique {
width: 282px;
height: 448px;
margin-bottom: 40px;


div {
width: 282px;
height: 58.5px;
margin-bottom: 12px;
display: flex;

img {
width: 58.5px;
height: 58.5px;
padding: 11.7px;
margin-bottom: 8px;
border-radius: 16px 0px 0px 0px;

}

p {
width: 205.96px;
height: 43.91px;
top: 7.29px;
left: 76.04px;
}
}

img {
width: 282px;
height: 353.39px;
border-radius: 16px;
}

}

@media (max-width: 426px) {
.footer-responsive {
display: inline-block;
}
}
59 changes: 59 additions & 0 deletions src/components/anonymous/MigrationCoop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import React from 'react';
import Footer from '../Footer';

function MigrationCoop() {
return (
<div className="footer-responsive">
<div className="page-migration">
<div className="fr-container">
<div className="fr-grid-row">
<div className="fr-col">
<div className="div-annonce-migration">
<div>
<h1 className="fr-alert__title">
Migration vers la nouvelle version de la plateforme !
</h1>
<div className="fr-tag">
<img src="/logos/pin-conum.png" />
<p>
Les adresses e-mails professionnelles
@conseiller-numerique.fr ainsi que l’ancienne version de
l’espace Coop ont été supprimés aujourd’hui.
</p>
</div>
<p>
Nous vous invitons à créer votre compte sur la nouvelle
version de la plateforme où vous pourrez retrouvez toutes
vos données de l’ancienne version et découvrir de nouvelles
fonctionnalités adaptées à la pratique de la médiation
numérique.
</p>
</div>
<a href="https://coop-numerique.anct.gouv.fr">
<button
className="fr-btn fr-btn--icon-right fr-fi-external-link-line fr-link--icon"
>
Voir le site
</button>
</a>
</div>
</div>
<div className="fr-col-2"></div>
<div className="fr-col-4">
<div className="div-coop-mediation-numerique">
<div>
<img src="/logos/iconeCoop.png" />
<p>La Coop de la médiation numérique</p>
</div>
<img src="/logos/coopMediationNumerique.png" />
</div>
</div>
</div>
</div>
</div>
<Footer />
</div>
);
}

export default MigrationCoop;
4 changes: 2 additions & 2 deletions src/services/cra.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export const craService = {
const apiUrlRoot = import.meta.env.VITE_APP_API;

function createCra(cra) {
// eslint-disable-next-line no-unused-vars
const { idStructure, ...craObj } = cra;
// eslint-disable-next-line no-unused-vars
const { idStructure, ...craObj } = cra;

const requestOptions = {
method: 'POST',
Expand Down