ajout logo et image fond

client/modules/App/App.js

@@ -10,6 +10,8 @@ import { CssBaseline } from '@material-ui/core';
 import Header from './components/Header/Header';
 import Footer from './components/Footer/Footer';
 
+import bg from '../../assets/route.jpg';
+
 export const App = (props) => (
   <React.Fragment>
     <CssBaseline />
@@ -31,7 +33,9 @@ export const App = (props) => (
       />
       <Header
       />
-      <div className={styles.container}>
+      <div
+        style={{ background: `#FFF url(../${bg}) center no-repeat` }}
+        className={styles.container}>
         {props.children}
       </div>
       <Footer />

client/modules/App/components/Footer/Footer.css

@@ -1,18 +1,19 @@
-.footer{
-  text-align: center;
+.footer {
   padding: 56px 0;
   background-size: cover;
   position: relative;
+  text-align: center;
 }
 
-.footer p{
+.footer p {
+  background: #eee;
   margin: 0 0 8px 0;
   font-size: 14px;
   color: #FFF;
 }
 
-.footer a{
-  color: #FFF;
+.footer a {
+  color: #fff;
   text-decoration: none;
   font-weight: 700;
 }

client/modules/App/components/Footer/Footer.js

@@ -3,33 +3,57 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router';
 import { withStyles } from '@material-ui/core';
 
-import bg from '../../header-bk.png';
+import bg from '../../../../assets/header-bk.png';
+import logoDSR from '../../../../assets/logoDSR.jpg';
+import logoLAB from '../../../../assets/logoLAB.png';
 
 const styles = () => ({
   footer: {
     color: '#fff',
     textAlign: 'center',
-    padding: '56px 0',
+    padding: '20px 0',
     backgroundSize: 'cover',
   },
+  credit: {
+    paddingRight: 20,
+    background: '#EEE',
+    color: '#000',
+    textAlign: 'right',
+  },
+  copyright: {
+    background: `#FFF url(../${bg})`,
+    textAlign: 'center',
+  },
   footerLink: {
     color: '#fff',
     textDecoration: 'none',
     '&:hover': {
       textDecoration: 'underline',
-    }
+    },
   },
 });
 
-
 export const Footer = ({ classes = {} }) => (
-  <div
-    style={{ background: `#FFF url(../${bg}) center` }}
-    className={classes.footer}
-  >
-    <p>
-      © 2018 · Candilib. - <Link to="/mentionslegales" className={classes.footerLink}>Mentions legales</Link>
-    </p>
+  <div className={classes.footer}>
+    <div className={classes.credit}>
+      <h5> Un service proposé par</h5>
+      <div>
+        <img src={logoDSR} style={{ width: 80 }} alt="logo sécurité routière" />
+        <img
+          src={logoLAB}
+          style={{ paddingLeft: 20, height: 80 }}
+          alt="logo sécurité routière"
+        />
+      </div>
+    </div>
+    <div className={classes.copyright}>
+      <p>
+        © 2018 · Candilib. -{' '}
+        <Link to="/mentionslegales" className={classes.footerLink}>
+          Mentions legales
+        </Link>
+      </p>
+    </div>
   </div>
 );
 

client/modules/App/components/Header/Header.css

@@ -1,5 +1,5 @@
 .header {
-  background: #eee url('../../header-bk.png') center;
+  background: #eee url('../../../../assets/header-bk.png') center;
   background-size: cover;
   border-bottom: 1px solid #ccc;
 }

client/modules/App/components/Header/Header.js

@@ -1,25 +1,36 @@
 import React from 'react';
 import { Link } from 'react-router';
-import { Toolbar, AppBar, Button } from '@material-ui/core';
+import { Toolbar, AppBar, Button, Grid } from '@material-ui/core';
 
 // Import Style
 import styles from './Header.css';
 
+import logo from '../../../../assets/candilib_logo.png';
+import beta from '../../../../assets/beta.png';
+
 function Header() {
   return (
     <div className={styles.header}>
       <AppBar color="default" position="static">
-        <Toolbar>
-          <Button component={Link} to="/">
-            Accueil
-          </Button>
-          <Button component={Link} to="/informations">
-            Informations
-          </Button>
-          <Button component={Link} to="/auth?redirect=calendar">
-            Ma Réservation
-          </Button>
-        </Toolbar>
+        <Grid container spacing={24}>
+          <Grid item xs={9}>
+            <Toolbar>
+              <img src={logo} style={{width: 200}} alt="logo" />
+              <Button component={Link} to="/">
+                Accueil
+              </Button>
+              <Button component={Link} to="/informations">
+                Informations
+              </Button>
+              <Button component={Link} to="/auth?redirect=calendar">
+                Ma Réservation
+              </Button>
+            </Toolbar>
+          </Grid>
+          <Grid item xs={3}>
+            <img src={beta} style={{width: 60, height: 60,float: "right"}} alt="version beta" />
+          </Grid>
+        </Grid>
       </AppBar>
     </div>
   );

client/modules/Calendar/pages/CalendarListPage/CalendarListPage.js

@@ -369,7 +369,7 @@ class CalendarListPage extends Component {
     if (isDeleteResa && isDeleteResa !== null) {
       candidat.temp = creneau;
       creneau = {
-        id: candidat.temp.id
+        id: candidat.temp.id,
       };
     }
     candidat.creneau = creneau;
@@ -542,7 +542,7 @@ class CalendarListPage extends Component {
                   color="primary"
                   variant="contained"
                   className={classes.buttonContactUs}
-                  href="mailto: candilib93@developpement-durable.gouv.fr"
+                  href="mailto: candilib@interieur.gouv.fr"
                 >
                   Nous contacter
                 </Button>

client/modules/Home/components/Login/Login.js

@@ -36,7 +36,7 @@ const styles = theme => ({
     },
   },
   paper: {
-    marginTop: theme.spacing.unit * 8,
+    marginTop: theme.spacing.unit * 3,
     display: 'flex',
     flexDirection: 'column',
     alignItems: 'center',

server/config.js

@@ -13,6 +13,8 @@ const config = {
   mailFrom: process.env.MAIL_FROM || '<mail_from>',
   tokenCandidatExpired: process.env.CANDIDAT_EXPIREDIN || '1h',
   appURL: process.env.APP_URL || 'http://localhost:8000',
+  URLlogoDSR: process.env.URLlogoDSR || "https://www.cartaplac.com/images/logo-securite-routiere.jpg",
+  URLlogoCandilib: process.env.URLlogoCandilib || "http://localhost:8000/88de6e0a1de39551b1be962a38d2f911.png",
 };
 
 export const smtpOptions = {

server/util/messageMailManager.js

@@ -50,7 +50,7 @@ const mailMessage = (candidatAurige, flag) => {
   <br>
   <p>Nous avons bien pris en compte votre réservation à l'examen pratique
   du permis de conduire à ${site} le ${dateCreneau} à ${heureCreneau} avec
-   le numéro NEPH ${codeNeph}.!</p>
+   le numéro NEPH ${codeNeph}.</p>
   <p>${siteAdresse.adresse} </p>
   <br>
   <p>Nous vous rappelons les éléments à vérifier le jour de l'examen :</p>

server/util/sendMagicLink.js

@@ -94,12 +94,10 @@ const sendMagicLink = (candidatAurige, token) => {
                                             <tbody>
                                               <tr>
                                                 <td>
-                                                  <img width="80px" src="https://www.cartaplac.com/images/logo-securite-routiere.jpg" />
+                                                  <img width="80px" src=${serverConfig.URLlogoDSR} />
                                                 </td>
-                                                <td class="w580"  width="580" align="center" bgcolor="#64b5f6">
-                                                  <h2>
-                                                    CANDILIB
-                                                  </h2>
+                                                <td class="w580"  width="580" align="center">
+                                                  <img width="300px" src=${serverConfig.URLlogoCandilib} alt="Candilib" />
                                                 </td>
                                               </tr>
                                               <tr>

server/util/sendMail.js

@@ -1,7 +1,7 @@
 import nodemailer from 'nodemailer';
 import smtpTransport from 'nodemailer-smtp-transport';
 import mailMessage from './messageMailManager';
-import serverConfig, { smtpOptions } from '../config';
+import serverConfig, { smtpOptions} from '../config';
 
 
 const sendMailToAccount = (candidatAurige, flag) => {
@@ -86,12 +86,10 @@ const sendMailToAccount = (candidatAurige, flag) => {
                                                                     <tbody>
                                                                         <tr>
                                                                             <td>
-                                                                              <img width="80px" src="https://www.cartaplac.com/images/logo-securite-routiere.jpg" />
+                                                                              <img width="80px" src=${serverConfig.URLlogoDSR} />
                                                                             </td>
-                                                                            <td class="w580"  width="580" align="center" bgcolor="#64b5f6">
-                                                                                <h2>
-                                                                                   CANDILIB
-                                                                                </h2>
+                                                                            <td class="w580"  width="580" align="center">
+                                                                                <img width="300px" src=${serverConfig.URLlogoCandilib} alt="Candilib" />
                                                                             </td>
                                                                         </tr>
                                                                         <tr>