Merge pull request #39 from NicolasMarqui/FixNotistack

DA-44, DA-52 and DA-53: Notistack fixes
dataplane-app · Dec 24, 2021 · 8187a7d · 8187a7d
2 parents 1a9259e + fe4ff93
commit 8187a7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -56,6 +56,7 @@ function App() {
                       </Button>
                     )}
                     autoHideDuration={60000}
+                    style={{ marginTop: 80 }}
                 >
                     <Box className="app" backgroundColor="background.main">
                         <UserAuth

diff --git a/frontend/src/components/LoginForm/index.jsx b/frontend/src/components/LoginForm/index.jsx
@@ -12,7 +12,6 @@ const LoginForm = ({ handleNext }) => {
   const {
     register,
     handleSubmit,
-    watch,
     formState: { errors },
   } = useForm();
 
@@ -26,12 +25,16 @@ const LoginForm = ({ handleNext }) => {
 
     let response = await loginUser(allData);
 
+    if(!response){
+      return enqueueSnackbar("An error has occured", { variant: "error" });
+    }
+
     if(response && response?.access_token){
       localStorage.setItem("refresh_token", response.refresh_token);      
       history.push(`loginCallback?accesstoken=${response.access_token}&refreshtoken=${response.refresh_token}`)
     }else{
       response.errors.map(err => {
-        enqueueSnackbar(err.message, { variant: "error" });
+        return enqueueSnackbar(err.message, { variant: "error" });
       })
     }
   }