M app/src/containers/CreateEvent/Step1.js → app/src/containers/CreateEvent/Step1.js

@@ -49,62 +49,58 @@ 
   return (
     <>
       <Paper {...props}>
-        <form onSubmit={onNext}>
-          <TextField
-            className={classes.textField}
-            label={t('event.creation.event_name')}
-            fullWidth
-            autoFocus
-            margin="dense"
-            value={name}
-            onChange={e => setName(e.target.value)}
-            id="NewEventName"
-            name="name"
+        <TextField
+          label={t('event.creation.event_name')}
+          fullWidth
+          autoFocus
+          margin="dense"
+          value={name}
+          onChange={e => setName(e.target.value)}
+          id="NewEventName"
+          name="name"
+        />
+        <TextField
+          label={t('event.creation.creator_email')}
+          fullWidth
+          margin="dense"
+          value={email}
+          onChange={e => setEmail(e.target.value)}
+          id="NewEventEmail"
+          name="email"
+          type="email"
+        />
+        <div className={classes.tos}>
+          <Checkbox
+            name="tos"
+            id="NewEventTos"
+            checked={tos}
+            onChange={e => setTos(e.target.checked)}
           />
-          <TextField
-            className={classes.textField}
-            label={t('event.creation.creator_email')}
-            fullWidth
-            margin="dense"
-            value={email}
-            onChange={e => setEmail(e.target.value)}
-            id="NewEventEmail"
-            name="email"
-            type="email"
-          />
-          <div className={classes.tos}>
-            <Checkbox
-              name="tos"
-              id="NewEventTos"
-              checked={tos}
-              onChange={e => setTos(e.target.checked)}
-            />
-            <Typography
-              component="a"
-              role="button"
-              variant="caption"
-              onClick={toggleTos}
-              tabIndex="0"
-              onKeyPress={({charCode}) => {
-                if (charCode && (charCode === 32 || charCode === 13))
-                  toggleTos();
-              }}
-            >
-              {t('event.creation.tos')}
-            </Typography>
-          </div>
-          <Button
-            className={classes.button}
-            type="submit"
-            variant="contained"
-            color="secondary"
-            fullWidth
-            disabled={!canSubmit}
-            aria-disabled={!canSubmit}
+          <Typography
+            component="a"
+            role="button"
+            variant="caption"
+            onClick={toggleTos}
+            tabIndex="0"
+            onKeyPress={({charCode}) => {
+              if (charCode && (charCode === 32 || charCode === 13)) toggleTos();
+            }}
           >
-            {t('event.creation.next')}
-          </Button>
-        </form>
+            {t('event.creation.tos')}
+          </Typography>
+        </div>
+        <Button
+          className={classes.button}
+          type="submit"
+          onClick={onNext}
+          variant="contained"
+          color="secondary"
+          fullWidth
+          disabled={!canSubmit}
+          aria-disabled={!canSubmit}
+        >
+          {t('event.creation.next')}
+        </Button>
       </Paper>
       <TosDialog open={showTos} toggle={toggleTos} />
     </>
@@ -112,7 +108,6 @@ );
 };
 
 const useStyles = makeStyles(theme => ({
-  textField: {},
   button: {
     marginTop: theme.spacing(2),
   },

M app/src/containers/CreateEvent/Step2.js → app/src/containers/CreateEvent/Step2.js

@@ -1,36 +1,36 @@ 
-import React, { useState } from "react";
-import { makeStyles } from "@material-ui/core/styles";
-import TextField from "@material-ui/core/TextField";
-import Button from "@material-ui/core/Button";
-import { useTranslation } from "react-i18next";
-import { DatePicker } from "@material-ui/pickers";
-import moment from "moment";
-import { useHistory } from "react-router-dom";
-import { useToast } from "../../contexts/Toast";
-import Paper from "../../components/Paper";
+import React, {useState} from 'react';
+import {makeStyles} from '@material-ui/core/styles';
+import TextField from '@material-ui/core/TextField';
+import Button from '@material-ui/core/Button';
+import {useTranslation} from 'react-i18next';
+import {DatePicker} from '@material-ui/pickers';
+import moment from 'moment';
+import {useHistory} from 'react-router-dom';
+import {useToast} from '../../contexts/Toast';
+import Paper from '../../components/Paper';
 
-const Step2 = ({ event, addToEvent, createEvent, ...props }) => {
+const Step2 = ({event, addToEvent, createEvent, ...props}) => {
   const classes = useStyles();
-  const { t } = useTranslation();
+  const {t} = useTranslation();
   const history = useHistory();
-  const { addToast } = useToast();
+  const {addToast} = useToast();
 
   // States
   const [date, setDate] = useState(!!event.date ? moment(event.date) : null);
-  const [address, setAddress] = useState(event.address ?? "");
+  const [address, setAddress] = useState(event.address ?? '');
 
   const onCreate = async () => {
-    const eventData = { date: date?.toISOString(), address };
+    const eventData = {date: date?.toISOString(), address};
     addToEvent(eventData);
     const result = await createEvent(eventData);
-    if (!result) addToast(t("event.errors.cant_create"));
+    if (!result) addToast(t('event.errors.cant_create'));
     else history.push(`/e/${result.id}`);
   };
 
   return (
     <Paper {...props}>
       <DatePicker
-        label={t("event.creation.date")}
+        label={t('event.creation.date')}
         value={date}
         onChange={setDate}
         className={classes.textField}
@@ -42,13 +42,13 @@ name="date"
       />
       <TextField
         className={classes.textField}
-        label={t("event.creation.address")}
+        label={t('event.creation.address')}
         fullWidth
         margin="dense"
         multiline
         rows={4}
         value={address}
-        onChange={(e) => setAddress(e.target.value)}
+        onChange={e => setAddress(e.target.value)}
         id="NewEventAddress"
         name="address"
       />
@@ -60,13 +60,13 @@ fullWidth
         onClick={onCreate}
         id="NewEventSubmit"
       >
-        {t("generic.create")}
+        {t('generic.create')}
       </Button>
     </Paper>
   );
 };
 
-const useStyles = makeStyles((theme) => ({
+const useStyles = makeStyles(theme => ({
   textField: {},
   button: {
     marginTop: theme.spacing(2),

M app/src/containers/CreateEvent/index.js → app/src/containers/CreateEvent/index.js

@@ -1,23 +1,23 @@ 
-import React, { useState, useReducer } from "react";
-import { useStrapi } from "strapi-react-context";
+import React, {useState, useReducer} from 'react';
+import {useStrapi} from 'strapi-react-context';
 
 // Steps
-import Step1 from "./Step1";
-import Step2 from "./Step2";
+import Step1 from './Step1';
+import Step2 from './Step2';
 
 const steps = [Step1, Step2];
 
-const eventReducer = (state, item) => ({ ...state, ...item });
+const eventReducer = (state, item) => ({...state, ...item});
 
-const CreateEvent = (props) => {
+const CreateEvent = props => {
   const strapi = useStrapi();
   const [step, setStep] = useState(0);
   const [event, addToEvent] = useReducer(eventReducer, {});
   const Step = steps[step];
 
-  const createEvent = async (eventData) => {
+  const createEvent = async eventData => {
     try {
-      return await strapi.services.events.create({ ...event, ...eventData });
+      return await strapi.services.events.create({...event, ...eventData});
     } catch (err) {
       console.error(err);
       return false;

M app/src/containers/NewCarDialog/index.js → app/src/containers/NewCarDialog/index.js

@@ -15,7 +15,6 @@ import Typography from '@material-ui/core/Typography';
 import {makeStyles} from '@material-ui/core/styles';
 import {DateTimePicker} from '@material-ui/pickers';
 import {useToast} from '../../contexts/Toast';
-import {useEvent} from '../../contexts/Event';
 
 const Transition = React.forwardRef(function Transition(props, ref) {
   return <Slide direction="up" ref={ref} {...props} />;
@@ -31,7 +30,6 @@ const strapi = useStrapi();
   const {t} = useTranslation();
   const classes = useStyles();
   const {addToast} = useToast();
-  const {event} = useEvent();
 
   // States
   const [name, setName] = useState('');