M app/src/containers/SignUp/SignUp.js → app/src/containers/SignUp/SignUp.js

@@ -8,10 +8,13 @@ import CardActions from '@material-ui/core/CardActions';
 import {useToast} from '../../contexts/Toast';
 import {Redirect} from 'react-router-dom';
 import {CircularProgress} from '@material-ui/core';
+import {makeStyles} from '@material-ui/core/styles';
 
-export default () => {
+const SignUp = () => {
   const {t} = useTranslation();
-  const {signUp, authState = {}} = useAuth();
+  const classes = useStyles();
+
+  const {signUp, token} = useAuth();
   const [isLoading, setIsLoading] = useState(false);
   const [firstName, setFirstName] = useState('');
   const [lastName, setLastName] = useState('');
@@ -45,20 +48,14 @@ } else {
           addToast(t(`generic.errors.unknown`));
         }
       }
-      console.log('SIGN UP');
-
       setIsLoading(false);
       return false;
     },
     [firstName, lastName, email, password, addToast, signUp, t, isLoading]
   );
 
-  if (authState.user) {
-    return authState.user.confirmed ? (
-      <Redirect to="/dashboard" />
-    ) : (
-      <Redirect to="/register/success" />
-    );
+  if (!!token) {
+    return <Redirect to="/register/success" />;
   }
 
   return (
@@ -118,7 +115,9 @@ aria-disabled={!canSubmit}
           id="SignUpSubmit"
         >
           {t('signup.submit')}
-          {isLoading && <CircularProgress />}
+          {isLoading && (
+            <CircularProgress class={classes.loader} size={20} color="white" />
+          )}
         </Button>
         <Button id="SignUpLogin" href="/login">
           {t('signup.login')}
@@ -127,3 +126,10 @@ </CardActions>
     </form>
   );
 };
+
+const useStyles = makeStyles(theme => ({
+  loader: {
+    marginLeft: '14px',
+  },
+}));
+export default SignUp;

M app/src/locales/fr.json → app/src/locales/fr.json

@@ -39,8 +39,6 @@ },
     "actions": {
       "show_details": "Détails de l'événement",
       "hide_details": "Cacher les détails",
-      "add_car": "Ajouter une voiture",
-      "invite": "Inviter",
       "find_car": "Trouver une voiture",
       "copied": "Le lien a été copié dans votre presse-papier",
       "add_to_my_events": "Ajouter à mes évènements",
@@ -122,8 +120,9 @@ "email_taken": "Email déjà pris"
     },
     "success": {
       "title": "Bienvenue !",
-      "text": "Nous avons besoin de confirmer votre email avant de pouvoir vous connecter",
-      "login": "Se connecter"
+      "text_html": "Lorem Ipsum dolor sit amet, consectetur <strong>adipiscing elit</strong>",
+      "dashboard": "Aller sur son tableau de bord",
+      "create_event": "Créer un évènement"
     }
   },
   "signin": {

M app/src/pages/SignUpSuccess.js → app/src/pages/SignUpSuccess.js

@@ -1,11 +1,9 @@ 
-import React from 'react';
+import React, {useState} from 'react';
 import Layout from '../layouts/Centered';
 import Card from '@material-ui/core/Card';
 import CardMedia from '@material-ui/core/CardMedia';
 import Logo from '../components/Logo';
-import {Redirect} from 'react-router-dom';
 import {useTranslation} from 'react-i18next';
-import {useAuth} from 'strapi-react-context';
 import Button from '@material-ui/core/Button';
 import CardContent from '@material-ui/core/CardContent';
 import CardActions from '@material-ui/core/CardActions';
@@ -13,10 +11,6 @@ import Typography from '@material-ui/core/Typography';
 
 export default () => {
   const {t} = useTranslation();
-  const {token} = useAuth();
-  if (token) {
-    return <Redirect to="/dashboard" />;
-  }
   return (
     <Layout>
       <Card>
@@ -25,18 +19,29 @@ <CardContent>
           <Typography gutterBottom variant="h5" component="h2">
             {t('signup.success.title')}
           </Typography>
-          <Typography variant="body2" color="textSecondary" component="p">
-            {t('signup.success.text')}
-          </Typography>
+          <Typography
+            variant="body2"
+            color="textSecondary"
+            component="p"
+            dangerouslySetInnerHTML={{__html: t('signup.success.text_html')}}
+          />
         </CardContent>
         <CardActions>
           <Button
+            color="secondary"
+            variant="contained"
+            href={'/'}
+            id="SignUpSuccessCreateEvent"
+          >
+            {t('signup.success.create_event')}
+          </Button>
+          <Button
             color="primary"
             variant="contained"
-            href={'/login'}
-            id="SignUpSuccessLogin"
+            href={'/dashboard'}
+            id="SignUpSuccessDashboard"
           >
-            {t('signup.success.login')}
+            {t('signup.success.dashboard')}
           </Button>
         </CardActions>
       </Card>